Answers for "understanding how to resolve merge conflicts in git manually"

git find merge conflicts

git diff --name-only --diff-filter=U

Posted by: Guest on March-12-2020

resolve merge conflict

git checkout develop
git merge --no-ff 'feature/imoh/issue#83_fingerprintRecognition'
git push origin develop

Posted by: Guest on March-24-2022

Code answers related to "understanding how to resolve merge conflicts in git manually"