I took a bet on Sublime Merge with some amount of skepticism and boy it has paid off. After two years of using it, git sort of makes sense now.