Rebasing and merging in clear case
问题 While rebasing the development stream in clear case, there are some times where a file needs to be merged because the local version is out of sync with one in the recommended baseline. Now intuitively, I was thinking that merge tool will offer two options :file 1(local) and file 2:(in recommended baseline). But in reality, I am being asked to choose from 3 files. What are these 3 files? 回答1: The 3 files are: common ancestor (or "base contributor") source (or "source contributor") destination