Re: [Gnu-arch-users] merging use-case

[James Blackwell]

In lists.arch.users, Robert Anderson wrote:

> They have done some development which textually conflicts with
> mine.  We are up to a point where they want to merge my latest
> changes, but this merge will involve conflicts that I understand
> how to fix easily, but they don't.  Therefore, I want to fix up
> the conflicts for them, to make the merge as painless as possible
> for them.

They should perform the star merge, then apply the rejects by hand.

The further their code gets from yours, the more difficult this will
become. I would suggest that they merge from you early and often, to
keep rejects as small as possible.

> My thought here is to tag their latest, star-merge my changes
> from mainline, fix up the conflicts, commit, then have them
> star-merge that branch.  I'm just not sure if that leaves their
> tree in the desired state:  the requirement is that further
> commits to the mainline should be cleanly star-merge'able into
> their branch.

Sure, this will work. This is just a long winded way of saying that
you'll do the merging for them. 

> Sanity check?

That'll work fine from a functional standpoint, but I think that you're
spoiling the kids. :)




-- 
James Blackwell          Try something fun: For the next 24 hours, give
Smile more!              each person you meet a compliment!

GnuPG (ID 06357400) AAE4 8C76 58DA 5902 761D  247A 8A55 DA73 0635 7400