Git reset stash conflict

git reset --merge

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 vote284 views1 answer
Simulate keys with powershell
Shell/Bash
1 vote220 views1 answer
Get first line of output bash
Shell/Bash
0 vote264 views1 answer
Bash get types of file extensions in directories
Shell/Bash
2 votes264 views4 answers
How to use zsh on mac
Shell/Bash
1 vote266 views1 answer
Brave disable gpu linux
Shell/Bash
0 vote282 views1 answer
How to install swift on ubuntu
Shell/Bash
1 vote292 views1 answer
Bash how to print the list of files in a directory
Shell/Bash
0 vote285 views2 answers
How to clear docker-compose logs
Shell/Bash
4 votes306 views3 answers
Brew services start mongodb
Shell/Bash
0 vote266 views1 answer
How to install bower dependencies
Shell/Bash