问题 输入：$ git status 输出： On branch master Your branch and 'origin/master' have diverged, and have 25 and 1 different commits each, respectively. (use "git pull" to merge the remote branch into yours)

nothing to commit, working tree clean

输入：$ git pull 输出：Auto-merging hello.py CONFLICT (add/add): Merge conflict in hello.py Auto-merging README.md CONFLICT (content): Merge conflict in README.md Auto-merging LICENSE CONFLICT (add/add): Merge conflict in LICENSE

在输入：$ git status 输出：On branch master Your branch and 'origin/master' have diverged, and have 25 and 1 different commits each, respectively. (use "git pull" to merge the remote branch into yours)

You have unmerged paths. (fix conflicts and run "git commit") (use "git merge --abort" to abort the merge)

Unmerged paths: (use "git add <file>..." to mark resolution)

    both added:      LICENSE
    both modified:   README.md
    both added:      hello.py

no changes added to commit (use "git add" and/or "git commit -a") 输完：$ git merge --abort 再输入：$ git status 输出：On branch master Your branch and 'origin/master' have diverged, and have 25 and 1 different commits each, respectively. (use "git pull" to merge the remote branch into yours)

nothing to commit, working tree clean 不知道怎么办了，我怎么把那些分支删除