Conflict handling

[Aaron Bentley]

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

Wouter van Heyst wrote:
> What about providing a hook for an external tool to get called
> during/after merge? 

We certainly can.  'During merge' seems a bit risky to me, since that
means you only get one chance to resolve the issue.  (For automated
tools like wiggle, you can just implement another merge type, but for
meld et al., it would be bad to accidentally quit.)

> People who do not want any pollution ever can
> resolve conflicts as they arise.

I guess I'm now leaning towards the notion of storing the conflict files
in a separate directory, and only producing (copies of) them at the
user's request.  Certainly, my experience is that I usually don't want
.BASE, .THIS and .OTHER.

How does that sound?

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

iD8DBQFD8KJA0F+nu1YWqI0RAlZ3AJ4v1mYKQHip6Ld9mCAeJtuBdjKUvACdFAoP
dzR5tk4CDzb3kR+TgWWApnI=
=4w0C
-----END PGP SIGNATURE-----