How do I resolve conflicts with Git?

git github merge git-merge merge-conflict-resolution
Neil G picture Neil G · Aug 6, 2015 · Viewed 7.7k times · Source

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.

Answer

Paul H picture Paul H · Aug 6, 2015

First you need to make sure you have the upstream remote repository set:

git remote add upstream [email protected]: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

Related questions

Git - Different Remote for each Branch

I'm unsure of how to ask this properly but I'll try and do my best - I'm by no means a Git aficionado, I know how to use the basic commands but not advanced terminology/functionality. I have a private …

Read More
Git pull a certain branch from GitHub

I have a project with multiple branches. I've been pushing them to GitHub, and now that someone else is working on the project I need to pull their branches from GitHub. It works fine in master. But say that someone …

Read More
Git merge with force overwrite

I have a branch called demo which I need to merge with master branch. I can get the desired result with following commands: git pull origin demo git checkout master git pull origin master git merge demo git push origin …

Read More