[Top][All Lists]

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

Re: Repeated Conflicts

From: Jeraimee Hughes
Subject: Re: Repeated Conflicts
Date: Fri, 20 Feb 2004 12:34:05 -0500
User-agent: Mutt/

On Thu, Feb 19, 2004 at 01:21:47PM -0800, Paul Sander wrote:
> Chances are you're using the default common ancestor for each merge.  The
> 3-way merge algorithm then rediscovers each change made cumulatively on both
> branches each time.  The solution is to specify the result of the last merge
> as the common ancestor when you run "cvs update".  For that, you must tag
> the results of each merge and remember to use that tag for the next merge.

We are merging only one branch at a time e.g.:

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.

We have attempted to merge (after commiting changes from the above)
from release to html but the same conflicts still arise.

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

Later when doing another merge after the above has happened:
cvs update -kk -j html -r merged_into .

This however doesn't quite make sense to me.

> --- Forwarded mail from address@hidden
> We now have developers working in multiple branches.
> When ready I merged their branches into a release branch.
> When merging I'm finding myself fixing the same conflicts over and
> over.
> I have a feeling I'm missing something simple in our process. Any 
> enlightenment?
> --- End of forwarded message from address@hidden

reply via email to

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