Answers for "reset merge conflict"

7

How to undo a git merge with conflicts

git reset --merge
Posted by: Guest on March-01-2021
0

git stash apply undo merge conflict

git reset HEAD .
Posted by: Guest on December-04-2020
0

resolve merge conflict

git fetch origin
git checkout -b 'feature/imoh/issue#83_fingerprintRecognition' 'origin/feature/imoh/issue#83_fingerprintRecognition'
git merge develop
Posted by: Guest on March-24-2022

Code answers related to "Shell/Bash"

Browse Popular Code Answers by Language