O'Reilly logo

IBM Rational ClearCase 7.0: Master the Tools That Monitor, Analyze, and Manage Software Configurations by Tatiana Shpichko, Marc Girod

Stay ahead with the world's most comprehensive technology and business learning platform.

With Safari, you learn the way you learn best. Get unlimited access to videos, live online training, learning paths, books, tutorials, and more.

Start Free Trial

No credit card required

Rebase or home merge

After presenting multiple examples of trivial merges produced with the merge command, we must apologize to our reader for what could be seen as confusing and contradictory: we pushed rather far the extent of the acknowledgement that we would describe a mechanism, not recommend a process.

Let's make our point explicit: any merges resulting in mere duplication of data are to be avoided whenever possible. Note how this precisely condemns trivial and copy merges!

SCM attempts to factor commonalities and make real differences stand out. On the contrary, using both of two identical versions introduces spurious differences into the dependency tree of dependent artifacts, and results in invalidating derived objects for artificial reasons. ...

With Safari, you learn the way you learn best. Get unlimited access to videos, live online training, learning paths, books, interactive tutorials, and more.

Start Free Trial

No credit card required