Merge to live, live to merge

Wednesday, December 31, 2008 2 Comments

I've just published a new post explaining the basics of merging on the DDJ guru's blog.

I'm writing a series or articles describing the very basics of merging since I still find people afraid of merging (and lock-prone) very often.

Here are the links:

  • Part I
  • Part II

    Stay tuned!
  • We develop Plastic SCM, a version control that excels in branching and merging, can deal with huge projects and big binary assets natively, and it comes with GUIs and tools to make everything simpler.

    If you want to give it a try, download it from here.

    We are also the developers of SemanticMerge, and the gmaster Git client.


    1. Seems there's a problem with the links - you get a "This Account Has Been Suspended Please contact the billing/support department as soon as possible. " when you try to visit either of them.

    2. The DDJ site should be back online in a few minutes, I've just check with them.