1

I have been merging from one merge to an integration branch for some time. It always shows some files for merge needed, But they are not needed since there is no difference between the version in source branch as well as destination branch. is there any way to get rid of this? at the moment, i manually undo checkout those.

user2636464
  • 685
  • 7
  • 17

1 Answers1

1

You should still merge those, or ClearCase will keep proposing them on the next merge.

If you do merge them, that will draw a merge hyperlink between the source and destination version of those files, and they shouldn't be present in the next merge.

If we are talking about a certain type of file, you also can modify the type manager merge policy, as in "Clearcase UCM is trying to merge pdf files".

Community
  • 1
  • 1
VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250
  • its a normal file not any special one. and I cannot merge because even if it says merge required, source and destination are same.do you mean checkin even if identical to predec? – user2636464 Jan 16 '14 at 11:44
  • @user2636464 yes, `ct ci --identical`, and see if it pops up on the next merge. – VonC Jan 16 '14 at 11:45