CODEWITHSUNDEEP
mergeclearcase
user2636464
user2636464

Reputation: 735

clearcase merge issue because of old updated code checkin

I am having a major issue with clearcase merge:

I have a list of files taken from clearcase long time back and updated outside clearcase. In between, the same files have changed in clearcase as well. Now, I created a new branch and checked in the updated code from outside in the new branch.

But when I want to merge from new branch to integration branch, it automatically merges and overwrites the changes in integration branch with the changes from new branch. What I would have expected it to atleast raise a conflict and not wipe out the changes made in clearcase integration branch.

can anyone help here please?

Upvotes: 1

Views: 186

Answers (1)

VonC
VonC

Reputation: 1324337

You need to be careful from which version you are starting your new branch.

If you are starting a new branch from the LATESt version of the current branch, in order to:

  • clearfsimport your code modified outside of ClearCase
  • merge said new branch to your current branch

Then, yes, all changes will overwrite the current versions.

But if you make your branch from an older version (a previous label or UCM baseline), import your code there and merge, then the merge will work or generate conflict if appropriate.

In other words, you need to start your branch from what you estimate is a common ancestor for your merge to work.
See "Rebasing and merging in ClearCase":

ClearCase merge.

Upvotes: 1

Related Questions