/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

8 votes207 views2 answers
Update cocoapods version mac
Shell/Bash
1 vote183 views1 answer
Removing git from files
Shell/Bash
95 votes191 views6 answers
Install react router
Shell/Bash
0 vote192 views2 answers
Homebrew nysql launch
Shell/Bash
0 vote206 views1 answer
Upload package to gitlab package registry
Shell/Bash
1 vote241 views1 answer
If else in mac terminal
Shell/Bash
0 vote252 views1 answer
Install bc command linux
Shell/Bash
0 vote197 views1 answer
Run .c file linux
Shell/Bash
0 vote305 views3 answers
CocoaPods not installed
Shell/Bash
1 vote218 views1 answer
Increase ssh session timeout linux
Shell/Bash