/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

27 votes135 views4 answers
How to add new origin in git
Shell/Bash
1 vote136 views1 answer
Homebrew zsh completion
Shell/Bash
14 votes138 views1 answer
Update nodejs raspberry pi
Shell/Bash
8 votes154 views4 answers
Create new git branch from existing branch
Shell/Bash
1 vote138 views2 answers
Install sdl2 linux
Shell/Bash
0 vote127 views1 answer
Wsl2 have systemctl ?
Shell/Bash
0 vote138 views4 answers
Kube dashboard expose access port
Shell/Bash
0 vote131 views1 answer
Mongo import all from bson
Shell/Bash
1 vote128 views1 answer
Run mutiple sass files at once
Shell/Bash
0 vote164 views1 answer
How to create bootable usb on manjaro
Shell/Bash