Hi Bruce, On Tue, 9 Dec 2008 17:17:08 -0500 "J. Bruce Fields" <bfields@xxxxxxxxxxxx> wrote: > > I could rebase nfsd onto net in this case if that'd simplify your life. > Assuming net never rebases that wouldn't cause additional conflicts for > you. > > And that's more-or-less what we'll end up doing come the merge window > anyway. > > (Or we could pull one of net or nfsd into the other.) The net tree never rebases, so pulling it into your tree is fine and a good solution. That would move the conflict resolution from my tree to yours (which is always better since you know your code better than I do). The only thing to remember is that the net tree should be merged into Linus' before the nfsd tree during the merge window. (It doesn't really matter, but is good form as then Dave will get blamed for any problems introduced by his tree rather than you :-)) The only other downside is that if Dave's tree has a bug (in the part you have merged) that causes me to drop it then I will have to drop your tree as well. However, that doesn't happen very often (right, Dave? :-)). The alternative of Dave merging your tree into his only works if you can guarantee that you will never rebase your tree. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpb3UISL9D00.pgp
Description: PGP signature
