I recently encountered an error in GitKraken after a bad merge occurred when trying to merge in some changes from the main development branch, whilst I had quite a few local changes that GitKraken usually automatically stashes for me. My problem was I was using Bash Ubuntu on Windows, which has a nasty habit of …
Git
Using Beyond Compare With Sourcetree For Mac
I used to use Diffmerge for my merge/comparison needs, however I find the outdated interface to be unfriendly and ugly to look at. On Windows I use Sourcetree and Beyond Compare works without integration, it shows up in the appropriate dropdowns but on Mac it does not. I don’t understand why Sourcetree on Mac is …
