Bad base selection / three-way-text-merge issues

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Robert Collins wrote:
| 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

You've just given a particularly nasty example, because it's not clear
which A gets deleted in THIS or OTHER.  We could change it to
BASE = ABC
THIS = AYC
OTHER = ZBC
But even so, it's a judgment call.  Some neighbor lines will be totally
independent, some will be tightly dependent.  I suppose the risk of bad
clean merges is great enough that we should produce a conflict, instead.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDeA/Y0F+nu1YWqI0RAqJAAJ46DzDYAw4Hhsx8EDJA0RjW5QP/qQCfYN2O
frbRDJb287Q/2z/bVhuKzEM=
=WfWZ
-----END PGP SIGNATURE-----