Debian packaging with git and conflicts resolution

[Nicolas Duboc]

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 <nduboc at debian.org>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature
Url : http://lists.alioth.debian.org/pipermail/vcs-pkg-discuss/attachments/20081119/33f9d464/attachment.pgp