Skip to content

Instantly share code, notes, and snippets.

@marcelocarmona

marcelocarmona/simple-git-workflow

Created April 26, 2017 21:46
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save marcelocarmona/c1468ca57b715a5ef654e10f9ab07372 to your computer and use it in GitHub Desktop.
Save marcelocarmona/c1468ca57b715a5ef654e10f9ab07372 to your computer and use it in GitHub Desktop.
Download ZIP
Your 7826b2 patch will still cause a conflict when it's applied after pulling, but you can do the following:
Raw
simple-git-workflow
Your 7826b2 patch will still cause a conflict when it's applied after pulling, but you can do the following:
git reset --soft HEAD^
git stash
git pull
git stash pop # Will cause a conflict
git commit # Re-commit 7826b2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment