Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

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

branch: master

Fetching latest commit…

Octocat-spinner-32-eaf2f5

Cannot retrieve the latest commit at this time

Octocat-spinner-32 tasks
Octocat-spinner-32 tests
Octocat-spinner-32 .jshintrc
Octocat-spinner-32 .travis.yml
Octocat-spinner-32 Gruntfile.js
Octocat-spinner-32 README.md
Octocat-spinner-32 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

Something went wrong with that request. Please try again.