/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 vote197 views1 answer
Grep can't match dash dash
Shell/Bash
1 vote209 views1 answer
Ubuntu add public key to server
Shell/Bash
25 votes203 views3 answers
Git remove my local changes and pull from master
Shell/Bash
1 vote222 views1 answer
Linux view directory premmisiosns
Shell/Bash
12 votes193 views3 answers
Find text in linux file
Shell/Bash
2 votes206 views2 answers
Setting missing in ubuntu
Shell/Bash
2 votes186 views1 answer
Linux install sass
Shell/Bash
0 vote208 views1 answer
Enable fish shell in alacrtity teminal
Shell/Bash
1 vote291 views2 answers
Git Automatic merge failed; fix conflicts and then commit the result
Shell/Bash
0 vote189 views2 answers
How to install firefos on an rpi
Shell/Bash