/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

4 votes141 views2 answers
Get unpushed commits
Shell/Bash
0 vote135 views1 answer
Separate a file using a tag
Shell/Bash
0 vote144 views1 answer
Ubuntu server 20.04 list only user names
Shell/Bash
15 votes159 views2 answers
How to unzip using tar
Shell/Bash
2 votes133 views2 answers
How to access remote pstgres
Shell/Bash
0 vote129 views1 answer
Get repository url git cil
Shell/Bash
20 votes130 views6 answers
Revert to commit git
Shell/Bash
1 vote132 views1 answer
Node js nodemailer Error: Invalid login: 535-5.7.8 Username and Password not accepted.
Shell/Bash
0 vote163 views1 answer
Show dialog box shell script
Shell/Bash
0 vote135 views3 answers
Install slurm debian
Shell/Bash