1

I created a private branch in dynamic view and checked out a Eclipse .project file.
I modified the .project file along with other java classes.

Now I want to finish the private branch and merge all the java files.

But I don't want to merge the .project file.
I can uncheckout the .project file to proceed but I am wondering if there is a way to tell Clearcase to ignore the file (like svn and git ignoring files) and continue to finish the private branch.

Please let me how to ignore the .project file as described above?

VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250
sunrise
  • 195
  • 1
  • 11
  • Was my previous answer at http://stackoverflow.com/a/23831885/6309 helpful as well? – VonC Jun 11 '14 at 15:23
  • I am new to ClearCase from SVN and GIT background. A lot of struggling in the past a few weeks. Your answer definitely helped me a lot. Thanks very much. – sunrise Jun 13 '14 at 14:43
  • Regarding ClearCase and Git, you can read one of my older answers: http://stackoverflow.com/a/645771/6309 – VonC Jun 13 '14 at 16:48

1 Answers1

1

You can "ignore" that file by drawing a red arrow (a merge arrow) between the version of that .project in your branch to the existing version in the destination branch.
See "Merge arrow in ClearCase"

cleartool merge -ndata -to aFile -version /main/a/SourceVersion /main/a/DestVersion

Then you can start your merge between the two branches.
The .project will be ignored as ClearCase will think it has already been merged.

The other alternative is to change its type to "NEVER_MERGE" (as in "deliver merge automatic"), but that would affect .project merge ability between any branch.

Community
  • 1
  • 1
VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250