/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

9 votes189 views4 answers
Pull branch from remote to new local branch
Shell/Bash
0 vote250 views1 answer
How to uninstall neovim on linux
Shell/Bash
0 vote170 views4 answers
Cut tab linux
Shell/Bash
6 votes190 views2 answers
Create cert from pem
Shell/Bash
1 vote169 views1 answer
Wondershaper
Shell/Bash
0 vote200 views4 answers
Install watchman windows
Shell/Bash
28 votes185 views5 answers
Kubectl create namespace
Shell/Bash
0 vote175 views1 answer
How To Install the Apache Web Server on Ubuntu 18.04
Shell/Bash
11 votes189 views3 answers
How to Use SSH to Connect to a Remote Server in Linux
Shell/Bash
57 votes182 views2 answers
Get linux ver
Shell/Bash