[Top][All Lists]

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

RE: Branch/merge question....

From: Christopher.Fouts
Subject: RE: Branch/merge question....
Date: Tue, 1 Jun 2004 12:58:55 -0400

tkCVS (or the like) is an excellent tool to resolve conflicts...


-----Original Message-----
From: address@hidden
[mailto:address@hidden On
Behalf Of Urban Gabor
Sent: Tuesday, June 01, 2004 10:53 AM
To: address@hidden
Subject: Branch/merge question....


I have a rather specific issue here:

Suppose we have created a branch for a development in our module called
branch_A for a longer time. During the development we have decided to
intagrate all changes on the main branch into branch_A (and we have
tagged both the main/HEAD and the branch). After completing the task, we
are to integrate the branch into the main, but the second merging brings
out a rather annoying number of conflicts. The situation is the same
when we try to merga main into branch_A again.

As far as I know, the merge algorithm uses the younges
common ancestor of the source files. Am I able to set the
merga base to the last successfull integration? I recon this would blow
away some of our conflicts..

Thx in advance,

Linux is like a wigwam: no gates, no windows, and an apache inside!

Info-cvs mailing list

reply via email to

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