[pnfs] Error on git pull

[J. Bruce Fields]

On Tue, Mar 13, 2007 at 05:46:26PM -0700, Iyer, Rahul wrote:
> Since my changes are gonna be blown away anyways, I might as well make a
> patch of my changes and then get the tree anew. So, here's my question:
> All of the sessions code will need to be applied to both the pNFS tree
> and well as the "sessions only" tree.

Right.

> If the sessions code goes into the
> sessions tree, do I need to apply them locally to the pNFS tree and then
> send a patch for that tree too?

There's two ways to go:

	1. merging: Patch the sessions branch, then merge those changes into
	   the pnfs branch.

	2. rebasing: Patch the sessions branch, then tear the pnfs
	   branch down and replace it with a new branch constructed
	   by reapplying all of the patches in the pnfs branch to the
	   newly patched sessions branch.

I can't decide which would work best.

--b.