[RFC] How to better assist users in resolving conflicts

[John Arbash Meinel]

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


...
> I also noticed that we use '.new', '.moved' and '.diverted' in
> various cases and I think we should stick with '.THIS' and
> 'OTHER' when possible as the former are less obvious to casual
> users.

I'll mention that I think you can actually get both types of conflicts.
For example if you already have a "foo.OTHER" file sitting on your
filesystem (for whatever reason). And then do a merge that causes a text
conflict in "foo". The existing "foo.OTHER" file will get moved to
"foo.OTHER.moved".

Otherwise you would have to rename it to... "foo.OTHER.THIS" ?

The times when we use .OTHER are certainly distinct from when we use
.moved, I don't really know about .new and .diverted.

I can understand the confusion, but since we don't want to overwrite
files that we don't claim to understand...

I'll try to respond to other points tomorrow.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAktM/8MACgkQJdeBCYSNAAM5UgCg0tbJseBEsx5ZrU4nAFbtJFyu
HcsAnjP4L/1UvE3909u7vG9CMynQMtl3
=q0fa
-----END PGP SIGNATURE-----