Git Merge Commits Locally Sauced