相关疑难解决方法(0)

我有一个拉请求,GitHub告诉我"这个分支有必须解决的冲突." 我试过了:

~/src/networkx: git rebase origin/master
Current branch topo is up to date.
~/src/networkx: git merge origin/master
Already up-to-date.