grunt-merge

##GruntMerge

Grunt task that merges git branches for you.

###Install

npm install grunt-merge

###Example Gruntfile

module.exports = (grunt) ->
  grunt.config.data.merge =
    'a-b': [ 'a', 'b' ]

  grunt.task.loadTasks path.resolve(__dirname, "../node_modules/grunt-merge/lib")

This example creates a new branch (a-b) and then sequentially merges branches a and b into it.

Run grunt merge to execute your merges.

###Conflicts

If there are merge conflicts, the task stops and allows you to fix them.

When you're finished, run grunt merge again.

Watch this project on Github.

Follow Winton Welsh on Twitter.