https://github.com/sophilabs/gilp-merge-conflict

Gilp plugin to detect merge conflicts.
https://github.com/sophilabs/gilp-merge-conflict

gilp-plugin merge-conflicts

Last synced: 18 days ago
JSON representation

Gilp plugin to detect merge conflicts.

• Host: GitHub
• URL: https://github.com/sophilabs/gilp-merge-conflict
• Owner: sophilabs
• License: mit
• Created: 2016-06-27T23:30:35.000Z (over 8 years ago)
• Default Branch: master
• Last Pushed: 2023-01-06T15:19:12.000Z (almost 2 years ago)
• Last Synced: 2024-04-25T18:42:27.268Z (8 months ago)
• Topics: gilp-plugin, merge-conflicts
• Language: JavaScript
• Homepage: https://sophilabs.co/open-source
• Size: 1.29 MB
• Stars: 4
• Watchers: 14
• Forks: 0
• Open Issues: 14
• Metadata Files:
  • Readme: README.md
  • License: LICENSE

Awesome Lists containing this project

README

        
# Gilp Merge Conflict

[![travis][travis-image]][travis-url]

[![coverage][coveralls-image]][coveralls-url]

[![npm][npm-image]][npm-url]

[![downloads][downloads-image]][downloads-url]

[![js-semistandard-style][semi-image]][semi-url]

[![license][license-image]][license-url]

[![dependencies][dependencies-image]][dependencies-url]

[![dev-dependencies][dev-dependencies-image]][dev-dependencies-url]

Gilp plugin to detect merge conflicts.

## Installation

```bash

npm install gilp-merge-conflict

```

## Usage

```javascript

var gulp = require('gulp');

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

gulp.task('isort', function () {

  return gulp.src('**/*')

    .pipe(gilpMergeConflict())

    .pipe(gilpMergeConflict.failOnError());

});

```

## License

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.

## About

[![sophilabs][sophilabs-image]][sophilabs-url]

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

sophilabs are trademarks of sophilabs, inc.

[license]: /LICENSE

[sophilabs-image]: https://s3.amazonaws.com/sophilabs-assets/logo/logo_300x66.gif

[sophilabs-url]: https://sophilabs.co

[travis-image]: https://img.shields.io/travis/sophilabs/gilp-merge-conflict.svg?style=flat-square

[travis-url]: https://travis-ci.org/sophilabs/gilp-merge-conflict

[npm-image]: https://img.shields.io/npm/v/gilp-merge-conflict.svg?style=flat-square

[npm-url]: https://npmjs.org/packge/gilp-merge-conflict

[downloads-image]: https://img.shields.io/npm/dm/gilp-merge-conflict.svg?style=flat-square

[downloads-url]: https://npmjs.org/package/gilp-merge-conflict

[semi-image]: https://img.shields.io/badge/code%20style-semistandard-brightgreen.svg?style=flat-square

[semi-url]: https://github.com/Flet/semistandard

[coveralls-image]: https://img.shields.io/coveralls/sophilabs/gilp-merge-conflict.svg?style=flat-square

[coveralls-url]: https://coveralls.io/github/sophilabs/gilp-merge-conflict?branch=master

[license-image]: https://img.shields.io/github/license/sophilabs/gilp-merge-conflict.svg?style=flat-square

[license-url]: /LICENSE

[dependencies-image]: https://david-dm.org/sophilabs/gilp-merge-conflict.svg?style=flat-square

[dependencies-url]: https://david-dm.org/sophilabs/gilp-merge-conflict

[dev-dependencies-image]: https://david-dm.org/sophilabs/gilp-merge-conflict/dev-status.svg?style=flat-square

[dev-dependencies-url]: https://david-dm.org/sophilabs/gilp-merge-conflict#info=devDependencies