関連ワード:  git undo merge changes    git discard merge changes    git remove merge changes    git abort merge changes    git reset merge changes    git undo merge commits    git undo merge keep changes    git remove merge commits    git remove merge commits from history    git remove merge commits from branch