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