関連ワード:  git revert merge changes    git undo merge changes    git cancel merge changes    git revert local merge changes    git undo merge keep changes    git revert changes after merge    git revert changes from merge commit