raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-31 21:37:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Retry simple push-to-master script

Browse Source
This commit is contained in:
Rohan Mitchell
2015-05-06 17:59:36 +10:00
parent ad7e5a45bb
commit f84e704d99
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
script/ci/merge_branch_to_master.sh
View File

@@ -7,8 +7,4 @@ echo "--- Verifying branch is based on current master"
exit_unless_master_merged
echo "--- Pushing branch"
git checkout master
git merge origin/master
git merge origin/$BUILDKITE_BRANCH
git push origin master
git checkout origin/$BUILDKITE_BRANCH
git push origin $BUILDKITE_COMMIT:master