Git Undo Local Merge Commit