/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

116 votes183 views6 answers
Install npm ubuntu
Shell/Bash
1 vote196 views1 answer
How to make ubuntu automatic updates
Shell/Bash
0 vote189 views1 answer
Vim vimrc sudo
Shell/Bash
0 vote189 views1 answer
Check active cron jobs linux
Shell/Bash
0 vote181 views1 answer
Conda install django-cors-headers
Shell/Bash
4 votes187 views1 answer
How to copy file in ubuntu terminal
Shell/Bash
0 vote216 views2 answers
Removing letstencrypt from domain
Shell/Bash
8 votes214 views1 answer
Ssh command to put file from local to remote
Shell/Bash
0 vote203 views1 answer
How to install face_recognition with conda
Shell/Bash
0 vote246 views1 answer
Awk column decimal to integer
Shell/Bash