Git encuentra conflictos de fusión
git diff --name-only --diff-filter=U
Outrageous Ox
git diff --name-only --diff-filter=U
Merge conflicts usually occur when multiple developers work on the same code
of a project or when they work with several development branches.
Git merge warns the user about these conflicts.
Although most merge conflicts resolve automatically, there are cases when
git merge cannot resolve an issue.
# Accept the local version.
git checkout --ours <file name>
# Alternatively, to accept the local version for all conflicting files, use:
git merge --strategy-option ours
# Accept the remote version
git checkout --theirs <file name>
# Accept the remote version for all conflicting files with:
git merge --strategy-option theirsgit stash -- > take my project to temp memory
git pull -- > pull the project from GitHub to working directory
(my computer)
git stash pop -- > take my project to my working directory,
fix the conflict and merge the project.
git add .
git commit –m “comment”
git push
$ git status
$ git add .
$ git commit -a "Comment"git checkout develop
git merge --no-ff 'feature/imoh/issue#83_fingerprintRecognition'
git push origin develop$ git commit -m "Resolved merge conflict by incorporating both suggestions."