1

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?

Victor
  • 16,609
  • 71
  • 229
  • 409

1 Answers1

3

The 3 files are:

  • common ancestor (or "base contributor")
  • source (or "source contributor")
  • destination

This is a three-way merge. See "What are the basic clearcase concepts every developer should know?"

(and the fourth screen is the end result)

See also "How files and directories are merged"

merge

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