Alex Niedre, 2016
<<<<<<< HEAD This is the version in your checked out branch ======= This is the version in the branch you're trying to merge >>>>>>> master
PHP Storm's Conflict Resolution tool
Let's resolve a conflict!
Step 1
Step 2
Step 3
The dumbest conflict ever?
Compare different sides
Compare Right side and Result
Compare Left side and Result
What are the actual changes?
So... Do I care now?
Right side is not conflicting anymore
Git recursive merge conflict
git merge --diff-algorithm=[patience|minimal|histogram|myers]
And this...
Another hint