/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

1 vote176 views1 answer
Awk or statement
Shell/Bash
0 vote194 views1 answer
He5 command line
Shell/Bash
0 vote179 views2 answers
Where is zshrc in big sur
Shell/Bash
0 vote168 views1 answer
Conda install pyaudio
Shell/Bash
1 vote166 views1 answer
Bash && vs semicolon
Shell/Bash
-1 vote168 views2 answers
Git clone with branch name command
Shell/Bash
0 vote172 views1 answer
Install command-line ipfs
Shell/Bash
0 vote127 views1 answer
Install ktorrent pacman
Shell/Bash
0 vote243 views2 answers
Ros installation
Shell/Bash
0 vote173 views1 answer
Search a keyword in python documents in linux
Shell/Bash