Git Merge Commits Locally Hated