/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

5 votes205 views1 answer
Openssl read cert
Shell/Bash
0 vote138 views1 answer
Run.sh minecraft
Shell/Bash
0 vote138 views2 answers
Dockerfile inline comments
Shell/Bash
0 vote142 views1 answer
UINSTALL EVERTYHING INNO
Shell/Bash
0 vote146 views1 answer
Node-gyp rebuild error ubuntu 20.04
Shell/Bash
1 vote170 views1 answer
What causes a defunct process on the Linux system and how can you avoid it?
Shell/Bash
0 vote150 views1 answer
How to clone code from your github repository using token authentication
Shell/Bash
13 votes151 views4 answers
Gitignore files that are already tracked
Shell/Bash
29 votes152 views6 answers
Kill all ports mac
Shell/Bash
0 vote246 views2 answers
Ubuntu libqt4
Shell/Bash