How do I resolve conflicts with 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.
- Using Source Tree, rebase with conflict, rebase doesn't work after conflict resovled
- Automatically resolve git conflicts in binary files with a script
- git stash pop: avoiding stash drop and un-staging steps
- EGit marks files as having conflicts but the Merge Tool editor shows no red markers
- GitHub Pull Request complex conflicts
- Merge conflict, when branches aren't modifying the same line
3 Solutions collect form web for “How do I resolve conflicts with Git?”
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.
First you need to make sure you have the upstream remote repository set:
git remote add upstream firstname.lastname@example.org:networkx/networkx.git
Then You need to fetch
upstream/master and then rebase on that. It’s something along the lines of:
git fetch upstream git checkout <feature-branch> git rebase upstream/master
As git replays your work on top of upstream/master, conflicts will be raised and you’ll have to dive into the files to resolve them. Then you:
git add <files that you fixed> git rebase --continue
Try running this to see what remotes you have set up:
git remote -v
If you don’t already have a remote for the original repository you forked from in Github, you can add it as follows:
git remote add upstream https://github.com/networkx/networkx.git
This will name the remote upstream. After this, you can merge in the latest upstream into your branch and resolve your conflicts:
git fetch upstream git merge upstream/master
If the first
git remote -v command already showed a remote with that name, just use that instead of adding a new remote. Hope that helps.