Dealing with Merge Conflicts

If you’re coming from another version control system like e.g. Subversion you might be traumatized: conflicts in Subversion have the (rightful) reputation of being incredibly complex and nasty. One reason for this is that Git, simply stated, works completely different in this regard than Subversion. As a consequence, Git is able to take care of most things during a merge – leaving you with comparatively simple scenarios to solve.

Related Articles:

https://www.git-tower.com/learn/git/ebook/en/command-line/advanced-topics/merge-conflicts