Git Merge Commits Locally Owned