We recently heard about two really far branches in our codebase. Your mission, should you choose to accept it, is finding the changes and merging them. So I try a GIT diff within Atlassian SourceTree, my GIT client of choice,…