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.

New SemanticMerge is out today

Thursday, November 07, 2013 Pablo Santos , 0 Comments

We just released a new version of SemanticMerge:

This release includes several suggestions and fixes sent by the users:

  • semanticmergetool can now be launched with positional arguments. It means you can invoke it as semanticmergetool theirs.cs yours.cs base.cs output.cs instead of using the -s -d -b and -r arguments. We have implemented this to fix issues when launching SemanticMerge from SourceTree for Mercurial. It also helps launching from Perforce. The default order for positional arguments is source (theirs), destination (yours), base and output. It can be customized using the --fileparamorder flag. Sample: semanticmergetool --fileparamorder=b;s;d;r base.cs source.cs destination.cs result.cs
  • Drag and drop! It is now possible to drag and drop files to the file selection dialog that shows up when you invoke semanticmerge without arguments.
  • A new Linux/GTK version is ready including all the latest additions to the Windows version.
  • We fixed an issue in a complex merge scenario: merging two contributors where contributor 1 moves a subclass up to the parent container and deletes its old container while contributor 2 adds a subclass to the container deleted on the first contributor and adds there a new method. Not an easy one but it was reported by one of the users, and fixed!
  • Several improvements in Xmerge, the text-based builtin merge tool: better text selection (also added to Plastic), new icons, and a xmerge refactored scenario fixed too.

We've also released today SemanticMerge at the Visual Studio Gallery!


Pablo Santos
I'm the CTO and Founder at Códice.
I've been leading Plastic SCM since 2005. My passion is helping teams work better through version control.
I had the opportunity to see teams from many different industries at work while I helped them improving their version control practices.
I really enjoy teaching (I've been a University professor for 6+ years) and sharing my experience in talks and articles.
And I love simple code. You can reach me at @psluaces.

0 comentarios: