Re: [Monotone-devel] merging interface

[Richard Levitte - VMS Whacker]

In message <address@hidden> on Wed, 17 Nov 2004 17:29:35 +0100, Christof Petig 
<address@hidden> said:

christof> What do you think about the proposals in thread
christof> http://lists.gnu.org/archive/html/monotone-devel/2004-05/msg00045.html
christof> (continued at)
christof> http://lists.gnu.org/archive/html/monotone-devel/2004-06/msg00081.html

Hmm, I'm not sure I'm fond of having conflict markers committed.
Apart from the apparent problems with someone trying to compile a
marked file and resolving it in a quick-and-sloppy manner, there's
also this foul taste in my mouth when people are trying to use their
version control tool as a communication device.

Also, there's an issue that I didn't see raised at all: how do we deal
with binary files?

-----
Please consider sponsoring my work on free software.
See http://www.free.lp.se/sponsoring.html for details.

-- 
Richard Levitte                         address@hidden
                                        http://richard.levitte.org/

"When I became a man I put away childish things, including
 the fear of childishness and the desire to be very grown up."
                                                -- C.S. Lewis