Conflict handling
Vincent LADEUIL
v.ladeuil at alplog.fr
Mon Feb 13 15:47:40 GMT 2006
>>>>> "Aaron" == Aaron Bentley <aaron.bentley at utoronto.ca> writes:
Aaron> Wouter van Heyst wrote:
>> What about providing a hook for an external tool to get
>> called during/after merge?
Aaron> We certainly can. 'During merge' seems a bit risky to
Aaron> me, since that means you only get one chance to
Aaron> resolve the issue. (For automated tools like wiggle,
Aaron> you can just implement another merge type, but for
Aaron> meld et al., it would be bad to accidentally quit.)
>> People who do not want any pollution ever can resolve
>> conflicts as they arise.
Aaron> I guess I'm now leaning towards the notion of storing
Aaron> the conflict files in a separate directory, and only
Aaron> producing (copies of) them at the user's request.
Aaron> Certainly, my experience is that I usually don't want
Aaron> .BASE, .THIS and .OTHER.
Aaron> How does that sound?
Just great.
Vincent
More information about the bazaar
mailing list