/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 vote186 views2 answers
Useful utilities for centos 7
Shell/Bash
0 vote195 views1 answer
Share a given window on android
Shell/Bash
1 vote212 views1 answer
Arch linux change timezone
Shell/Bash
0 vote215 views1 answer
Grep output options
Shell/Bash
0 vote180 views1 answer
Remove xcode archives
Shell/Bash
1 vote186 views4 answers
Jdk ubuntu
Shell/Bash
10 votes180 views2 answers
Linux install ifconfig
Shell/Bash
7 votes207 views3 answers
Bluetooth not working in ubuntu 20.04
Shell/Bash
1 vote221 views1 answer
Check compatible ubuntu nvidia driver 18.04
Shell/Bash
7 votes202 views3 answers
Install steam on ubuntu
Shell/Bash