module.exports = [['checkout-master'], function (done) { if (!argv.b) { throw new Error('Branch não informado, informe-o usando o argumento -b'); } git.merge(argv.b, { args: '--no-ff' }, done); }];
gulp.task('sync-merge', ['setup'], function(){ for (var i=0; i < gitRepositories.length;i++) { git.merge( "upstream/master", { cwd: gitRepositories[i].localDirectory, quiet: true, sync: true}, function (err) { if (err) throw err; } ) } });
gulp.task("git-merge", function() { // switch to production branch git.checkout('production', function (err) { if (err) throw err; }); git.merge('master', function (err) { if (err) throw err; }); return; })
git.checkout('gh-pages', function (err) { if (err) throw err; git.merge('master', function (err) { if (err) throw err; git.push('origin', 'gh-pages', function(err) { if (err) throw err; git.checkout('master', function (err) { if (err) throw err; }); }); }); });
.then(function (stdout) { if (head.origin!==head.local){ git.merge('origin/master', function (err) { if (err) { throw err; } else{ existsUpdates=true;//builds enabled console.log('merged'); return deferred.resolve();//let gulp return from the task } }); } else{ console.log('no need to merge'); return deferred.resolve();//let gulp return from the task } });
gulp.task('merge', () => { git.merge('master', (err) => { if (err) throw err; }); });
gulp.task('git-merge-develop-into-master', function (done) { git.merge('develop', done); });
gulp.task('merge', function() { git.merge('master', function(err) { if (err) throw err; }); });