git - 如何解决与 Git 的冲突？

Question

我有一个 pull request为此 GitHub 告诉我“这个分支有必须解决的冲突”。我试过:

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

Answer 1

实际上...您不再需要在本地 pull 和 rebase 。
自 2016 年 12 月以来，您可以直接从 GitHub 解决(简单的) merge 冲突。

参见“Resolve simple merge conflicts on GitHub ”

You can now resolve simple merge conflicts on GitHub right from your pull requests, saving you a trip to the command line and helping your team merge pull requests faster.

The new feature helps you resolve conflicts caused by competing line changes, like when people make different changes to the same line of the same file on different branches in your Git repository.
You'll still have to resolve other, more complicated conflicts locally on the command line.