Skip to content

Instantly share code, notes, and snippets.

@nandub

nandub/gist:1381650

Created November 21, 2011 04:44
Show Gist options
  • Save nandub/1381650 to your computer and use it in GitHub Desktop.
Save nandub/1381650 to your computer and use it in GitHub Desktop.
Download ZIP
git fix merge conflicts steps
Raw
gistfile1.txt
cd <PROJECT>
git remote add upstream git@github.com:<GITHUB_ACCOUNT_NAME>/<PROJECT>.git
git fetch upstream
#Stash/commit all your work
git checkout develop
git merge upstream/develop
git checkout <FEATURE_BRANCH>
git merge develop
#Fix errors, merge conflicts, etc.
#Run tests
git push origin <FEATURE_BRANCH>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment