[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: merging branches

From: Spiro Trikaliotis
Subject: Re: merging branches
Date: Fri, 16 Feb 2007 20:17:20 +0100
User-agent: Mutt/1.5.9i


* On Fri, Feb 16, 2007 at 04:00:20PM +0100 Marx wrote:
> If I merge with -kkv, there are conflicts like
> >>>>>>>>
> <<<<<<<<
> and I must fix it manually

I do this the following way in such cases:

1. Keep a second sandbox of the project, which is checked out with "-kk"
   (or, you can just copy your original sandbox and update it with
   "-kk": "cvs update -kk"

2. Now, when merging, specify "-kk", too:
   "cvs update -kk -j ... -j ..."

This way, the conflict markers above are not issued because you don't
   have these RCS markers.

3. test and check in the changes

4. Go to the original sandbox and issue a normal "cvs up" there.

Note that I am not sure if this will work if some changed files are
binary. Because of this, I always perform these steps on a unixoid
machine, just to be sure. There, I always keep a second sandbox just for


Spiro R. Trikaliotis                               

reply via email to

[Prev in Thread] Current Thread [Next in Thread]