[cvsnt] Merge points when merging back
teva at Airspan.com
Mon Aug 20 15:59:42 BST 2007
Gerhard Fiedler wrote:
> Well, come to think of it, I probably could use the merge command to
> back from bMyBranch to HEAD, discard the merge results and replace the
> files on HEAD (after the merge but before the associated commit) with
> files of the branch. I guess that would be one way to do it -- but is
> a more straightforward way?
I think you want 'cvs update -jbMyBranch -jHEAD' (or the -j options
be the other way round?). Refer to Tony Hoyle's post from last year
Wed 07/06/2006 14:06.
More information about the cvsnt