Answers for "resolve merge conflicts on branch"

7

git find merge conflicts

git diff --name-only --diff-filter=U
Posted by: Guest on March-12-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