Recursive merge strategy?

[Martin Pool]

On  5 Dec 2005, Kevin Smith <yarcs at qualitycode.com> wrote:
> I saw this on the mercurial list, and I guess I have the same question 
> relative to bzr: Would GIT's recursive merge have any benefits for bzr?

It's an interesting idea.  It seems like you would sometimes end up with
very confusing output text when you keep trying to merge files with
conflict markers.

In general we are trying to get away from merge base selection by using
weave-merges, or more generally annotation-based merges, for both text
and file names.

-- 
Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051206/305d7857/attachment.pgp