[Top][All Lists]

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

About conflicts while merging

From: Johnny John
Subject: About conflicts while merging
Date: Tue, 09 Apr 2002 07:43:13 -0800


Frequently, I work on a branch and then merge as follows (assume my project is called testProj, and my branch is called Old_branch)

- cvs co testProj
- cvs update -j Root_Of_Old_branch -j Old_branch
- Work on resolving conflicts
- Check in

For the most part, conflicts have occurred as expected, however, occasionally I notice that conflicts are generated for certain files even though there have been *no* changes between the root of the branch (Root_Of_Old_branch) and the tip of the main trunk (testProj).

Any thoughts why? Any summaries of the algorithm used by CVS to generate conflicts?


reply via email to

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