Who we are

We are the developers of Plastic SCM, a full version control stack (not a Git variant). We work on the strongest branching and merging you can find, and a core that doesn't cringe with huge binaries and repos. We also develop the GUIs, mergetools and everything needed to give you the full version control stack.

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

We also code SemanticMerge, and the gmaster Git client.

Merging nightmare

Thursday, May 04, 2006 0 Comments





Yesterday Borja and me, were working on some improvements on the merge code. Well, he designed all the most horrible merge scenarios you can think of, or at least some of them.

The image shows a nice and complex version tree with lots of different test cases.

Now we are able to handle multiple merges to a same revision, and solving correctly the common ancestor. We were already solving those cases but with some unsolved issues.

0 comentarios: