/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 vote371 views1 answer
Install jupyter notebbok in pip
Shell/Bash
8 votes359 views2 answers
Linux chown
Shell/Bash
0 vote396 views1 answer
Centos 7 install grub
Shell/Bash
2 votes386 views2 answers
Ffmpeg scale but keep aspect ratio
Shell/Bash
13 votes366 views7 answers
Animate.css
Shell/Bash
1 vote384 views4 answers
Screen in ubuntu
Shell/Bash
5 votes349 views6 answers
How to install webpack
Shell/Bash
0 vote367 views1 answer
Git clone from url cmd
Shell/Bash
0 vote379 views1 answer
Add files to hadoop
Shell/Bash
0 vote400 views1 answer
Find files changed in github actions
Shell/Bash