Created
April 26, 2017 21:46
-
-
Save marcelocarmona/c1468ca57b715a5ef654e10f9ab07372 to your computer and use it in GitHub Desktop.
Your 7826b2 patch will still cause a conflict when it's applied after pulling, but you can do the following:
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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