[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Repeated Conflicts
From: |
Larry Jones |
Subject: |
Re: Repeated Conflicts |
Date: |
Fri, 20 Feb 2004 13:11:35 -0500 (EST) |
Jeraimee Hughes writes:
>
> cd /location/of/release/checkout
> cvs update -kk -j html www . 2>/dev/null
> - This merges changes from the html branch of the www module
>
> Once this is done, the same conflicts appear as the last time.
Of course -- you're merging the entire branch, so you're trying to
remake all the changes you already made the last time you merged.
> If I'm understanding your suggestion correctly I'd do something like:
>
> cvs update -kk -j html www .
> (fix conflicts, etc.)
> cvs commit -m "merged from html"
> cvs tag -r merged_into
A more conventional tag would be something like "html-merged".
> Later when doing another merge after the above has happened:
> cvs update -kk -j html -r merged_into .
No:
cvs up -kk -jmerged_into -jhtml
In other words, merge the changes between the tag and the tip of the
branch (just the new stuff).
-Larry Jones
Whatever it is, it's driving me crazy! -- Calvin