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 native Mac mergetool

Monday, December 28, 2015 Pablo Santos 0 Comments

We launched BL717 a few days ago, including the new native mergetool for Mac (a.k.a. macmergetool).

It is the long awaited Coca-based 3-way merge tool, a different GUI implementation for the same merge core shared by the Windows and the recently launched Linux version.

You can see it in full glory in the following screenshot:

How to set it up

It comes included with the Mac installer, so there’s not much you have to do.

If you never installed MacPlastic before, then the new mergetool will be automatically configured.

If you were already using an external 3-way mergetool such as Kdiff3 or Xcode’s file diff, then go to preferences to configure the “default” as new 3-way merge tool for text files and you’ll be done.

What is coming next?

At the time of writing this (Dec 2015) we still don’t include Xmerge/Xdiff (ability to track moved code) on the tool, something that the windows version features by default.

Line numbers and syntax highlight is also missing now from the Mac version, although we’ll be working on those soon.

We also need to add options to handle line endings and whitespaces, shortcuts for the main actions and the ability to properly manage merges where the different versions of the same file have different encodings.

But the main goal definitely was to have a working version so that our Mac users can enjoy the familiar mergetool and get rid of third-parties they didn’t want to use...

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: