Gilp plugin to detect merge conflicts.

npm install gilp-merge-conflict

var gulp = require('gulp');
var gilpMergeConflict = require('gilp-merge-conflict');

gulp.task('isort', function () {
  return gulp.src('**/*')
    .pipe(gilpMergeConflict())
    .pipe(gilpMergeConflict.failOnError());
});

Gilp Merge Conflict is Copyright (c) 2016 sophilabs, inc. It is free software, and may be redistributed under the terms specified in the license file.

Gilp Merge Conflict is maintained and funded by sophilabs, inc. The names and logos for sophilabs are trademarks of sophilabs, inc.