関連ワード:  cancel git pull conflict    revert git pull conflict    cancel git merge conflict    abort git pull conflicts    undo git pull conflict    abort git merge conflict    git cancel resolve conflict    revert git merge conflict    undo git merge conflict    git undo merge conflict resolution