/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

2 votes162 views1 answer
Ubuntu get full path of file
Shell/Bash
2 votes171 views1 answer
Removing a ipykernel in anaconda
Shell/Bash
0 vote189 views1 answer
Zsh silent backgrousd task output
Shell/Bash
20 votes121 views2 answers
How to extract tar.xz file in linux mint
Shell/Bash
0 vote167 views1 answer
Edit maven config settings.xml
Shell/Bash
0 vote171 views1 answer
Linux convert to md5
Shell/Bash
1 vote165 views3 answers
Rails db:rollback
Shell/Bash
1 vote147 views1 answer
Linux kernel type cli command
Shell/Bash
3 votes161 views3 answers
Yarn install No such file or directory: 'install'
Shell/Bash
0 vote256 views1 answer
How to install yagmail
Shell/Bash