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

[Matthew Gregan]

At 2007-03-03T11:46:22+0100, Richard Levitte - VMS Whacker wrote:
> I'm wondering, is there going to be a time when merge_into_workspace will
> just save the files with conflict markers in them?  And in that case, what
> will happen with non-text files?  Is this at all the intention?

There will be in-workspace conflict resolution, i.e. we'll write out a
workspace which has conflicts in it.  The conflicts may or may not be
represented using CVS-style conflict markers (I suspect not).

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

Cheers,
-mjg
-- 
Matthew Gregan                     |/
                                  /|                    address@hidden