no-git-merge-conflict.md

Prevents having Git merge conflict markers

Enforces to not have Git merge conflict markers.

Fail

const foo = 'foo';
<<<<<<< HEAD
const bar = 'bar';
=======
const bar = 'ba';
>>>>>>> master

const foo = 'foo';
<<<<<<< HEAD
const bar = 'bar';

const foo = 'foo';
const bar = 'bar';
=======

const foo = 'foo';
const bar = 'bar';
>>>>>>> master

Pass

const foo = 'foo';
const bar = 'bar';