mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-25 21:24:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

PR #824 -- revert one master reference for the build script

Browse source
This commit is contained in:
Peter Cottle 2021-04-19 08:23:29 -06:00
parent 54ea8c6d86
commit 617c22232d
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gulpfile.js
View file

@ -158,7 +158,7 @@ var gitAdd = function(done) {
}; };
var gitDeployMergeMain = function(done) { var gitDeployMergeMain = function(done) {
execSync('git checkout gh-pages && git merge main -m "merge main"'); execSync('git checkout gh-pages && git merge master -m "merge master"');
done(); done();
}; };
@ -166,7 +166,7 @@ var gitDeployPushOrigin = function(done) {
execSync('git commit -am "rebuild for prod"; ' + execSync('git commit -am "rebuild for prod"; ' +
'git push origin gh-pages --force && ' + 'git push origin gh-pages --force && ' +
'git branch -f trunk gh-pages && ' + 'git branch -f trunk gh-pages && ' +
'git checkout main' 'git checkout master'
); );
done(); done();
}; };