関連ワード:  git merge undo changes    git merge discard changes    git revert merge changes    git cancel merge changes    git merge conflict undo changes    git merge discard local changes    git merge discard remote changes    git undo merge keep changes    git undo merge but keep changes    git merge conflict discard changes