Skip to content

Commit

Permalink
pull staging before merging
Browse files Browse the repository at this point in the history
  • Loading branch information
avacreeth committed May 30, 2019
1 parent fa2ae60 commit 1425f02
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions bin/release.js
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,7 @@ async function runScript() {
info(`Merging ${targetBranch} back into staging...`);
try {
executeCmd(`git checkout staging`, { exit: false });
executeCmd('git pull'. { exit: false });
executeCmd(`git merge ${targetBranch}`, { exit: false });
executeCmd('git push origin HEAD', { exit: false });
} catch (e) {
Expand Down

0 comments on commit 1425f02

Please sign in to comment.