我如何解决与Git的冲突？ [英] How do I resolve conflicts with Git?

问题描述

我有一个

这个新功能可以帮助您解决竞争行更改引起的冲突，例如人们对山姆的同一行进行不同更改时e文件放在你的Git仓库的不同分支上。

你还需要在命令行本地解决其他更复杂的冲突。

I have a pull request for which GitHub tells me "This branch has conflicts that must be resolved." I tried:

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

解决方案

Actually... you don't have anymore to pull and rebase locally.
You can resolve (simple) merge conflicts right form GitHub, since Dec. 2016.

See "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.

这篇关于我如何解决与Git的冲突？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！