What do you want to save?
Add Code snippet
New code examples
-
Shell/Bash 2021-11-21 02:44:14
undo git stash with conflicts
git reset HEAD . (note the trailing dot) git stash (save the conflicted merge, just in case) git checkout develop git fetch upstream; git merge upstream/develop git checkout <new-branch>; git rebase develop git stash apply stash@{1} Add solution
Best helpers
Ranking is empty