/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 vote127 views1 answer
Afficher l'heure .bat
Shell/Bash
0 vote118 views1 answer
Copy file from linux to windows ssh
Shell/Bash
7 votes109 views2 answers
Git checkout -f
Shell/Bash
0 vote110 views1 answer
Use localhost for self signed cert
Shell/Bash
0 vote146 views1 answer
How to install lshellchecck in linux
Shell/Bash
0 vote106 views1 answer
How to do a pull request with one commit
Shell/Bash
0 vote120 views1 answer
Hugo serve
Shell/Bash
0 vote126 views1 answer
Add vite to existing project
Shell/Bash
28 votes120 views5 answers
Ram usage in linux
Shell/Bash
4 votes123 views3 answers
Get length of array bash
Shell/Bash