Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
Solve conflict

Solve Conflicts

Get newest code from upstream/master to your master branch

git checkout master
git pull upstream master

Checkout to current task and rebase with master branch

git checkout your_task
git rebase master

After resolving all conflicts

git add . 
git rebase --continue
git push origin your_task -f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.