Conflict handling

[Wouter van Heyst]

On Mon, Feb 13, 2006 at 10:14:08AM -0500, Aaron Bentley wrote:
> -----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.)

I'm thinking of tortoisesvn that allows you to resolve conflicts after
an update, but if you quit the merge window, nothing bad happens.

> > 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.

I do on occasion want to check them, but most of the times the conflict
markers in the conflicted file are good enough, +0 on not polluting the
tree.

Wouter van Heyst