Re: [Monotone-devel] About merge_into_workspace...

[Zack Weinberg]

On 3/3/07, Matthew Gregan <address@hidden> wrote:
> There was some discussion of a UI for in-workspace conflict resolution
> during the summit, but I can't find a write up of it in the wiki.  I can't
> remember exactly what was agreed upon, but I was only listening in while
> working on other stuff...

My slides ( which are linked from http://venge.net/mtn-wiki/Talks )
touched on the topic, but you're probably thinking of the long and not
terribly conclusive discussion among Dan, Nathaniel, Derek, and me
about how to represent a conflicted workspace *in the bookkeeping
data* -- not how to represent it to the user.

zw