@syntaxseed @b0rk I am keeping an eye out for gitbuttler. I use sublime merge when dealing with personal projects