KDiff3 master as git mergetool? Yes, please!

I like using kdiff3, I also like using git, I also like using bundles for applications. Let’s put the three together!

Set up the KDE git flatpak repo and install kdiff3

flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
flatpak remote-add --if-not-exists kdeapps --from https://distribute.kde.org/kdeapps.flatpakrepo
flatpak install kdeapps org.kde.kdiff3

Write a tiny shim around this so we can use it from git. Put it in /usr/bin/kdiff3 or $HOME/bin/kdiff3 if $PATH is set up to include bins from $HOME.

exec flatpak run org.kde.kdiff3 "$@"

Don’t forget to chmod +x kdiff3 it!

git mergetool should now pick up our kdiff3 wrapper automatically. So all that’s left to do is having a merge conflict and off we go with git mergetool


The Phonon Family is Moving and Splitting

Picture by freeasinfreedom@flickr

Today the Phonon family (Phonon, Phonon-VLC, Phonon-MPlayer) moved from Git to Git 😉

Long ago Phonon was living together with KDE supporting technologies in KDE SVN’s. At some point moving to Git was desired and so we moved to Gitorious, a free software for hosting Git. Now that KDE is rolling out its new infrastructure with Git at the center, we think that it is time to get back to our roots. This not because we are unhappy with Gitorious, but our wish is to stay as close to KDE as possible.

Additionally we have moved all Phonon backends into separate repositories. This permits faster development and releases independent from Phonon itself.

So, from a user perspective nothing will change (other than maybe getting a phonon-backend-gstreamer update some time soon ;)). If you are however contributing, or want to contribute in the future there are some things to know.


For read only access to the repositories you can use anongit:

git clone git://anongit.kde.org/phonon
git clone git://anongit.kde.org/phonon-gstreamer
git clone git://anongit.kde.org/phonon-vlc

For push access (i.e. developer access) you will need a KDE Identity and request developer access once you have created an account. Everyone who already had a KDE SVN account is imported into the identity service and you can get a password via password reset.

If you would like to also commit and push changes, please use the following prefixes:

git clone git@git.kde.org:phonon
git clone git@git.kde.org:phonon-gstreamer
git clone git@git.kde.org:phonon-vlc

KDE Projects

For repository browsing and getting general project information you can now use the KDE Projects sites, where you can find Phonon at the following URL:


Review Board

Is the central point for “merge requests” now. Please create a KDE identiy account for using this.

You may then propose changes using the “phonon” group for Phonon itself:


Or you may use the “phonon-backends” group for changes to any backend:


Git.KDE.org Manual

For more information on the new infrastructure please have a look at the Git.KDE.org Manual.

The Phonon team is very excited about all of this and wants to thank the KDE Sysadmin crew for pulling this off and generally being around and helpful and awesome.