Using TortoiseMerge on Linux with Bazaar

January 24, 2013 in version control

Having tried to fall in love with Meld and KDiff3, I’ve eventually gone back to my favourite merge tool, TortoiseMerge. It’s actually very straightforward to get running on Linux.

Pete Woods

[Remote] Java/C++ Engineer into DevOps, universally interested in technology

Lead Engineer at Surevine Ltd.

Lancaster, UK

Using TortoiseMerge on Linux with Bazaar

Pete Woods

Production-grade Spring Boot Docker images

p4merge for conflict-resolution on macOS

Using application.yml as the interface to Docker

Spring as a Java container abstraction - switching to Undertow

DRY principle with docker-compose

Building Docker images with Maven

Spring Boot 2.0 primer

Multiple JVM versions on macOS

Modernising with Bootstrap, HTML5 and CSS3

Keeping the heating on at Center Parcs