Today we’re closing down the top request in our Semantic Merge user voice: Linux Support!.
It took us a while to get it ready but now the first beta is out!! A Java-aware and C#-aware 3-way merge tool now running on Linux.
Go to www.semanticmerge.com/linux and follow the instructions to get it up and running on your distro.
It is a GTK based application so it will run smoothly and with a native look and feel.
If you’re new to Semantic it will be worth for you checking our intro guide to get familiar with the concepts. As you can see from the screenshot above it is not exactly as a regular 3-way merge tool! :-) (an explanation about why the GUI is built this way can be found here).
Get it installed
We’ve set up a few online repositories for Fedora, RHEL, CenOS and OpenSUSE as you can see here.
So what a typical installation takes is something like the following (I’ll be using OpenSUSE):
# zypper ar http://www.semanticmerge.com/semanticrepo/openSUSE_12.3/ \ semanticmerge_repo
(Everything in one line, split with "\" for the sake of formatting).
Then refresh the repositories
# zypper refresh
# zypper install semanticmerge
Don’t miss the samples!
Once you install semantic you’ll have a new directory /opt/semanticmerge/samples with a few sample cases inside:
Get familiar with the tool running the different examples. They’re all using kdiff3 as text-based mergetool (Semantic relies on a text tool to merge the method bodies, on Windows we include Xmerge, but on Linux so far we prefer to rely on a native tool) but you can configure your own.
How to run it
Running semanticmerge is very simple, just execute:
/opt/semanticmerge/semanticmergetool -s yours.cs -d mine.cs -b base.cs -r out.cs
To run a 3 way merge.
You’ll need to complete the previous command specifying a text-based merge tool to be able to resolve text-based conflicts, check the samples directory for details.
Get a license!
We’re in open beta mode so you can get licenses for free.
We have 3 types of licenses:
- Trial: 15 days, no questions asked.
- Beta period: you need to register at semanticmerge.com but then you can get a 2 months license.
- Unlimited: you can get them if you’re contributing to an OpenSource project. You’ll be able to purchase them once we get out of the beta program. And, you can get them now for free by inviting 5 friends!
The following picture explains the steps:
Bonus: mono 3.0.3 included
Yes, I think it will be good news to most of our readers to know that we’ve set up our own mono 3.0.3 repository (soon we will be upgrading to 3.2) with the help of b1-systems so it is a very easy way to get mono installed on some more distros :P
What is next
We started the Mac OS X version already so we expect to have news soon.
In parallel we’re improving the performance on Windows (affected by WPF).