/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

0 vote181 views1 answer
Install spotify-web-api-js
Shell/Bash
0 vote168 views1 answer
Display all branches in a git repo at once
Shell/Bash
2 votes184 views2 answers
Linux cli see screen resolution
Shell/Bash
1 vote165 views1 answer
Nx remove lib
Shell/Bash
0 vote172 views1 answer
Git clone different ssh key
Shell/Bash
0 vote193 views1 answer
Bash red text
Shell/Bash
0 vote178 views1 answer
Homebrew redis install
Shell/Bash
4 votes158 views1 answer
Vim replace tabs with spaces
Shell/Bash
0 vote163 views1 answer
Debian backports
Shell/Bash
3 votes185 views2 answers
Failed to load module "canberra-gtk-module"
Shell/Bash