How would you explain merges with ClearCase?

问题

I'm a developer who has never needed to worry about the implementation of source control systems / branching / merging etc... I'm searching for book which explains these concepts but is aimed at clearcase users.

From searching amazon - the book "IBM ClearCase 7.0: Master the Tools that Monitor, Analyze and Manage Software Configurations by Marc Girod and Tatiana Shpichko (26 Apr 2011)" seems to b a good read.

Any recommendations ?

Thanks.

回答1:

You will find a good introduction regarding merges in ClearCase with "How files and directories are merged"

The particularity of a merge with ClearCase is in its directory management.
As explained in "What are the basic clearcase concepts every developer should know?", directories are versioned too.

that means any merge in ClearCase will merge directories first, because it will determine the list of files needing merge (a version of a directory is a list of files).
And then it will merge files.

From there, you will find different merge scenarios explained in "About merging in base ClearCase".

来源：https://stackoverflow.com/questions/9534519/how-would-you-explain-merges-with-clearcase