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