Question

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.

Was it helpful?

Solution

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".

Licensed under: CC-BY-SA with attribution
Not affiliated with StackOverflow
scroll top