Re: [Monotone-devel] Re: [Monotone-commits-diffs] Revision c6569e455defcd6b0d889edcff0bb0fe6180a376

[Richard Levitte - VMS Whacker]

In message <address@hidden> on Thu, 1 Sep 2005 08:46:25 +0200 (CEST), 
address@hidden said:

ml-monotone> To make this changes effective on main branch however,
ml-monotone> one has to merge explicitly with the vendor branch AFAIR.

'cvs import' does a merge into the main trunk by default, unless it
finds a conflict.  That's when it tells you to do a merging update,
solve the conflicts and commit.

Cheers,
Richard

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