This commit is contained in:
benjamin melançon 2023-04-21 21:29:19 -04:00
parent 9ce108b525
commit 4e27cddbce

View file

@ -17,7 +17,7 @@ git reset HEAD^
to then be able to `git stash` changes from the commit, now local changes. To just throw everything in the commit away, `git reset --hard HEAD^` to then be able to `git stash` changes from the commit, now local changes. To just throw everything in the commit away, `git reset --hard HEAD^`
See https://sethrobertson.github.io/GitFixUm/fixup.html See [sethrobertson.github.io/GitFixUm/fixup.html](https://sethrobertson.github.io/GitFixUm/fixup.html)
## When NOT to manually resolve merge conflicts ## When NOT to manually resolve merge conflicts