Home/ Questions/Q 7628461
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-31T05:35:51+00:00

While rebasing the development stream in clear case, there are some times where a

  • 0

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?

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    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

    • 0