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.

Merge refactored code with ReSharper and SemanticMerge

Tuesday, June 17, 2014 Pablo Santos 0 Comments

Hi there!

Most of you probably already know, but we're running a webinar today to explain how to deal with merges involving code being refactored using ReSharper.

I'll be hosted by the folks at JetBrains and will cover a set of different refactors in C# + Visual Studio + ReSharper. Then I'll be showing how to get the code merged with SemanticMerge.

If you're interested, it will start at 16:00 CEST (or 10:00 AM EDT), and you can register here

0 comentarios: