January/February 2018 issue of acmqueue

The January/February issue of acmqueue is out now

Kode Vicious


  Download PDF version of this article PDF

ITEM not available


Originally published in Queue vol. 7, no. 9
see this item in the ACM Digital Library


Follow Kode Vicious on Twitter
and Facebook

Have a question for Kode Vicious? E-mail him at [email protected]. If your question appears in his column, we'll send you a rare piece of authentic Queue memorabilia. We edit e-mails for style, length, and clarity.


Jez Humble - Continuous Delivery Sounds Great, but Will It Work Here?
It's not magic, it just requires continuous, daily improvement at all levels.

Nicole Forsgren, Mik Kersten - DevOps Metrics
Your biggest mistake might be collecting the wrong data.

Alvaro Videla - Metaphors We Compute By
Code is a story that explains how to solve a particular problem.

Ivar Jacobson, Ian Spence, Pan-Wei Ng - Is There a Single Method for the Internet of Things?
Essence can keep software development for the IoT from becoming unwieldy.


(newest first)

Markus | Thu, 26 Nov 2009 21:36:29 UTC

Well, I love the proprietary Rational ClearCase. It's my SCM system of choice as I grew up with it (professionally) though I haven't worked with it for over a year. ClearCase's merge tool works great most of the time. If there is a merge conflict, the graphical merge tool shows three versions (the source version, the current version, and the version which is the most recent common ancestor of both) and allows you to pick the code of the version you require simply by clicking the appropriate button.

I agree with most of what you have to say about merging often, KV, although I disagree with your time-of-day argument. A merge should take place at the most appropriate time - for example, when a predefined deadline has been reached or simply by agreeing (verbally, e-mail, etc) with your fellow coders when to perform it. Tagging/labeling versions ready for merge will aid the merge process and is very useful within geographically-dispersed teams.

A terminology issue: I seem to remember that, in ClearCase-speak, a merge to a subbranch from a superbranch is termed 'rebase' - all other forms of merge are simply referred to as 'merge'. Is this tool-specific?


JX | Tue, 10 Nov 2009 20:49:50 UTC

I'm actually a CS undergrad getting my hands dirty with Subversion right now... and I am loving it. Some people are telling me:"You should use git instead or mercurial" But, really for a beginner into SCM, Subversion with TurtoiseSVN just makes sense!

What's really scary is that very few of my professors know about SCM and isn't something they teach you at college. That's something I am learning on my own.

The Fool | Fri, 30 Oct 2009 19:52:46 UTC

I love "meld", a graphical diff and merge tool. It shows you the differences graphically, click a button when you decide to transfer a change from one version to the other. AFAIK it only works in Linux/Unix (and Mac OSX) but in Python so maybe you can run it on Windows with some work.


Leave this field empty

Post a Comment:

© 2018 ACM, Inc. All Rights Reserved.