/Shell/Bash/Undo git stash with conflicts

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}

Source: stackoverflow.com

Similar codes

0 vote110 views1 answer
Ffmpeg extract single frame
Shell/Bash
9 votes111 views2 answers
Ubuntu 18.04 jenkins The following signatures couldn't be verified because the public key is not available:
Shell/Bash
0 vote107 views1 answer
"serverless-prune-plugin" not found.
Shell/Bash
1 vote112 views2 answers
Git delete last commit after push
Shell/Bash
0 vote124 views1 answer
Microsoft todo for linux
Shell/Bash
1 vote136 views1 answer
Keep sudo on
Shell/Bash
0 vote110 views1 answer
How to install terraform macos
Shell/Bash
0 vote117 views1 answer
Git discard all unpushed commits
Shell/Bash
4 votes102 views1 answer
Turn off selinux centos
Shell/Bash
0 vote114 views1 answer
Pull Ubuntu image
Shell/Bash