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 theirsThis is very question because I am facing
with this issue all the time. Basically
conflict arises when more than one commit
that has to be merged with some change in the
same place or same line of code. In this case
git will not be able to predict which change
to take. So my approach to fix this issue,
I would stash my project to temporary memory
and pull the project from github to working
directory. I would fix the confict and
merge the project and than I would add,
commit and push it the updated version.
git 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 commit -m "Resolved merge conflict by incorporating both suggestions."