Channels ▼  Pablo Santos  Dr. Dobb's Bloggers  Live merge, merge
to live. Part II  December 29, 2008   This is the second part of
the series of articles about merging. In the previous post I
talked about automatic merges and how the version control
systems solve the conflicts for you. But, whenever you start
thinking about merging you'll say: "hey, what if we touch the
same code?". I'll try to answer this question here.  You're in
trouble: manual conflicts  Developer's life can be exciting and
full of challenges, but it is not easy. So, eventually you'll
face a situation like the one depicted here:   Figure 3. A
conflict on the same code block  Yes, know we've modified
exactly the same code in one of our changes on the file, which
makes things much more complicated.  Now you can say "the tool
can't know the right solution!".  And you're right. But, as I
told you, the merge tool is not a wizard's device; it is just a
programmer's tool. So, use it correctly and it will make your
life much easier.  Figure 4 show