関連ワード:  git abort pull conflict    git abort resolve conflicts    git undo pull conflict    git undo resolve conflict    cancel git pull conflict    git cancel resolve conflict    git abort pull merge conflict    git undo pull merge conflict    git undo pull after conflict    git abort changes and pull