On Tue, Nov 18, 2008 at 04:22:08PM -0800, Russ Allbery wrote: > The tmp-merge branch doesn't have this problem > since it's branched off upstream and doesn't have your old B and C > branches merged, and by the time you merge tmp-merge into master, you have > all of your conflicts resolved already and the merge goes smoothly.
Yes, actually the integration branch gives a path to the three topic branches when the merge algorithm tries to find the common commit ancestor of the commit from the master branch and the commit from the integration branch. So for each file with a potential conflict the patch finally applied contains the conflict resolution. > As Manoj points out, this only works if A, B, and C don't conflict with > each other. If they do, you probably want to just use rerere. Manoj, could you detail a particular scenario where you had conflicts between the topic branches ? -- Nicolas Duboc <[EMAIL PROTECTED]>
signature.asc
Description: Digital signature
_______________________________________________ vcs-pkg-discuss mailing list vcs-pkg-discuss@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/vcs-pkg-discuss
