Conflict resolution workflow (was Re: Recipes vs. Looms vs. pipelines)

[Barry Warsaw]

On Dec 17, 2009, at 6:29 PM, Aaron Bentley wrote:

> If we did follow your approach, we'd have to decide
> 1. which revision gets designated as the merge
> 2. what do we do with the conflict metadata
> 3. what do we do with the conflict files
> 4. what should we do when checking out a revision with conflicts
> 5. what should we do when merging a revision with conflicts

Honestly, I have no idea what the right thing to do is ;).  I'm mostly just stating the problem I guess.  Hopefully that's enough to get your much superior brain juices flowing. 

> Alternatively, it wouldn't be too hard to implement "diff -r merged:" as
> a way of comparing the tree to its state immediately after the merge
> completed.  That would give you a way to see what changes you had done
> as part of merge resolution.

That would be a very good first (and sounds like, easy) step, especially if that can be done as I'm resolving the conflicts (i.e. before committing the results of the merge+resolve).

-Barry