[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] merging interface
From: |
Richard Levitte - VMS Whacker |
Subject: |
Re: [Monotone-devel] merging interface |
Date: |
Wed, 17 Nov 2004 18:42:24 +0100 (CET) |
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
- Re: [Monotone-devel] Command for changing passphrase; documentation fixes; test cases, (continued)
- Re: [Monotone-devel] Command for changing passphrase; documentation fixes; test cases, Matt Johnston, 2004/11/16
- [Monotone-devel] Status update, Nathaniel Smith, 2004/11/17
- [Monotone-devel] merging interface (was Re: Status update), Bruce Stephens, 2004/11/17
- Re: [Monotone-devel] merging interface, Richard Levitte - VMS Whacker, 2004/11/17
- [Monotone-devel] Re: merging interface, Bruce Stephens, 2004/11/17
- Re: [Monotone-devel] merging interface, Olivier Andrieu, 2004/11/17
- [Monotone-devel] Re: merging interface, Bruce Stephens, 2004/11/17
- Re: [Monotone-devel] Re: merging interface, Olivier Andrieu, 2004/11/17
- Re: [Monotone-devel] merging interface, Christof Petig, 2004/11/17
- [Monotone-devel] Re: merging interface, Bruce Stephens, 2004/11/17
- Re: [Monotone-devel] merging interface,
Richard Levitte - VMS Whacker <=
- [Monotone-devel] Re: merging interface, Bruce Stephens, 2004/11/17
- Re: [Monotone-devel] Re: merging interface, Richard Levitte - VMS Whacker, 2004/11/17
- Re: [Monotone-devel] Re: merging interface, Jon Bright, 2004/11/18
- Re: [Monotone-devel] merging interface, Christof Petig, 2004/11/18
- Re: [Monotone-devel] merging interface (was Re: Status update), derek, 2004/11/17
- Re: [Monotone-devel] Status update, Olivier Andrieu, 2004/11/17
- Re: [Monotone-devel] Status update, Joel Rosdahl, 2004/11/18
- Re: [Monotone-devel] Status update, Nathaniel Smith, 2004/11/20
- Re: [Monotone-devel] Status update, Derek Scherger, 2004/11/20