Cleartool findmerge select changes from file 2 by default in all cases?
问题 So I have a branch is that is dreadfully out of date with the rest of the world. I'd love to simply create a new branch and merge over... but that task would be even larger... anyways what I'm trying to figure out is if I can set findmerge to always accept file 2. To speed my merge up, I initially did: cleartool findmerge <path to out of date code> -ftag <my merge from view> -merge -abort to cover all the simple merges, but not I want to grab the 'conflicting' changes, but I really just want