How to accept one version for all manual merge changes in clearcase?
Question
When I am having to manually merge a file using xmerge, I have to click through every change manually and select a number to be the version to use. But sometimes I just want to accept one version for every change. Is there a shortcut/setting for this?
1 answers
solution1
2 ACCPTED 2014-04-08 01:20:05
One shortcut is the button Resolve and Advance .
Once clicked, you can then repeatedly click on one version button, until there is no more merge conflict to solve (then save and close)
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.
Related Question
ClearCase merge-conflict-on-rebase mystery — why does manual merges are sometimes required when doing a rebase for a file that has NO local changes?
In Git how do make my current branch master or merge it to master but force it to accept all my changes
Merge conflict resolution: how to accept all remote changes except the ones in files changed by $AUTHOR?
How to merge all changes from one branch into another
Find merge arrows pointing to a version in ClearCase
Mercurial: How to merge with manual control over changes & files?
How to perform a 'merge' using clearcase?
git merge question: how to accept your version of a file?
How do you redo the manual merge of just one file in mercurial?
How do you check for a merge in Clearcase?
Related Tags