Grunt task that merges git branches for you.
npm install grunt-merge
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
b into it.
grunt merge to execute your merges.
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.