Grunt plugin for preventing you from accidentally comitting a merge conflict into your project
JavaScript
Switch branches/tags
Nothing to show
Fetching latest commit…
Cannot retrieve the latest commit at this time.
Permalink
Failed to load latest commit information.
tasks
tests
.jshintrc
.travis.yml
Gruntfile.js
README.md
package.json

README.md

grunt-merge-conflict Build Status

Grunt plugin for preventing you from accidentally comitting a merge conflict into your project.

Getting Started

This plugin requires Grunt ~0.4.0

If you haven't used Grunt before, be sure to check out the Getting Started guide, as it explains how to create a Gruntfile as well as install and use Grunt plugins. Once you're familiar with that process, you may install this plugin with this command:

npm install grunt-merge-conflict --save-dev

Once the plugin has been installed, it may be enabled inside your Gruntfile with this line of JavaScript:

grunt.loadNpmTasks('grunt-merge-conflict');

merge-conflict task

Run this task with the grunt merge-conflict command.

Task targets, files and options may be specified according to the grunt Configuring tasks guide.

Example

"merge-conflict": {
  files: [
    '**/*'
  ]
}

Running the Tests

Run grunt test.

License

BSD