How to resolve Merge Conflicts?

Submitted by Rajasekhar on Sat, 11/10/2018 - 13:28
  1. Sometimes, automatic merges will not be possible due to changes having been merged into the repository that our changes conflict with. To fix this, we need to follow the conflict resolution workflow.
    • Initiate the merge process using the Git merge command.
    • Manually choose which changes to merge into the master branch.
    • Commit the resolved merge changes to the repository.
  2. Conflicts arise if two branches edit the same part of the same file. Git can’t resolve the merge automatically. Git will require some human intervention to solve the issue.
  3. Git log (for history).