/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 vote271 views1 answer
How to clone pull all repositories from github
Shell/Bash
39 votes254 views3 answers
Sudo unzip command
Shell/Bash
0 vote208 views1 answer
Output text after specific character powershell
Shell/Bash
0 vote238 views1 answer
Recutils add field in record
Shell/Bash
0 vote271 views1 answer
Bash equivalent of /?
Shell/Bash
-3 votes276 views2 answers
Docker mssql
Shell/Bash
0 vote258 views1 answer
How to install opencv in anaconda, jupyter notebook
Shell/Bash
0 vote303 views1 answer
Symfony5 bundle shema
Shell/Bash
0 vote252 views1 answer
Yum snap install --classic certbot
Shell/Bash
0 vote262 views1 answer
Error: Fetching /usr/local/Homebrew/Library/Taps/commands/homebrew-pup failed!
Shell/Bash