/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

11 votes222 views2 answers
How uninstall composer
Shell/Bash
0 vote221 views1 answer
Seach only in name apt
Shell/Bash
0 vote257 views1 answer
Mvn clean install does not running test
Shell/Bash
0 vote261 views2 answers
Removing letstencrypt from domain
Shell/Bash
3 votes232 views1 answer
Styled components props typescript
Shell/Bash
0 vote221 views1 answer
Add geckodriver to path linux
Shell/Bash
0 vote318 views1 answer
Tree command levels
Shell/Bash
28 votes280 views6 answers
Composer install
Shell/Bash
27 votes227 views3 answers
Git config remote.origin.url
Shell/Bash
17 votes218 views1 answer
Notepad ++ debian
Shell/Bash