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?
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.
The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.