[pnfs] Error on git pull

[J. Bruce Fields]

On Mon, Mar 12, 2007 at 05:01:31PM -0700, Iyer, Rahul wrote:
> I got the error below on git pull. Is this because your merge is in
> progress?

Sorry about that; I should have warned you (and talked this over with
Andy) before making it public.  So there's now two branches:

	master (the default branch): has pNFS and and sessions
	4.1-sessions: sessions only

And we've fixed some whitespace damage.

But we did that by rewriting history--so now it looks like we *never*
had any whitespace damage, and like we did sessions first (as one big
commit) and then added pNFS.  Rewriting history in that way confuses
pull.  So what you want to do is:

	git fetch origin   # (or just "git fetch")

After this if you do

	git branch -r

it should show you the two branches from origin above (plus maybe a
"partial-sessions" branch--ignore that).

You can then reset the "master" (default) branch in your repository to
be identical to the master branch of the public repository with

	git checkout master   # if you aren't already on "master"
	git reset --hard origin/master

WARNING: save your work first!  That "git reset --hard" forcibly
modifies your current branch and your working directory so that they're
both identical to the tip of the public master branch; if you've done
work on your own, save it first.  Or you could instead leave your
current branch the same and just check out the public master branch on
another branch of your own:

	git checkout -b my-pnfs origin/master

More about branching and stuff here:

	http://www.kernel.org/pub/software/scm/git/docs/user-manual.html#id232662

or just a list of branching commands here:

	http://www.kernel.org/pub/software/scm/git/docs/user-manual.html#id273658

--b.