Bad base selection / three-way-text-merge issues
Robert Collins
robertc at robertcollins.net
Sun Nov 13 18:47:23 GMT 2005
On Sun, 2005-10-23 at 14:05 -0400, Aaron Bentley wrote:
> | I think this is insufficient - lines proximity to other lines influences
> | the semantic behaviour
>
> Perhaps you could clarify?
Sure. If you have:
A
A
A
and patch that to
A
B
A
in one branch, and
C
A
A
in another, a merge of them should conflict IMO rather than giving
C
B
A
Rob
--
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051114/df17146c/attachment.pgp
More information about the bazaar
mailing list