amorfo77/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2026-03-06 14:56:25 +00:00
Code Issues Projects Releases Wiki Activity

Added a git pull when docker-versions-create.sh starts with each branch

Browse Source
This commit is contained in:
Geoff Bourne
2020-02-01 08:52:00 -06:00
parent 9d67dceff3
commit 2ffc1641a0
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docker-versions-create.sh
View File

@@ -47,6 +47,9 @@ for branch in "${branches_list[@]}"; do
exit 1; }
proceed='False'
while [[ "$proceed" == "False" ]]; do
# Ensure local branch is aligned with remote since docker-versions-create may have been run elsewhere
git pull
if git merge -m 'Auto-merging via docker-versions-create' master; then
proceed="True"
echo "Branch $branch updated to current master successfully"