Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Grunt task that merges git branches for you

branch: master

Fetching latest commit…

Cannot retrieve the latest commit at this time

README.md

GruntMerge

Build Status NPM version

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.

Stay up to date

Watch this project on Github.

Follow Winton Welsh on Twitter.

Something went wrong with that request. Please try again.