Addressing merge conflicts

Merge conflicts happen when you merge branches that have competing commits, and Git needs your help to decide which changes to incorporate in the final merge.

You can resolve simple merge conflicts that involve competing line changes on , using the conflict editor.

You can resolve merge conflicts using the command line and a text editor.