/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

75 votes330 views6 answers
Kill ubuntu port
Shell/Bash
1 vote324 views1 answer
Linux shell echo command with varia ble
Shell/Bash
0 vote307 views1 answer
Curl with regex
Shell/Bash
0 vote307 views1 answer
Como atualizar a versão do angular
Shell/Bash
0 vote322 views10 answers
Laravel sanctum
Shell/Bash
19 votes317 views6 answers
Install apache2 ubuntu
Shell/Bash
8 votes289 views1 answer
Cmd add to path
Shell/Bash
0 vote312 views1 answer
How to use git stash in current branch
Shell/Bash
0 vote305 views1 answer
Surface area of a spherical shell
Shell/Bash
0 vote348 views2 answers
RHEL check the firewall status
Shell/Bash