amorfo77/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2026-08-31 19:27:15 +00:00
Code Issues Projects Releases Wiki Activity

Auto-merging via docker-versions-create

Browse Source
This commit is contained in:
Geoff Bourne
2019-11-16 09:04:17 -06:00
parent ca9c280b0b 97874f3481
commit e5d0a9362a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker-versions-create.sh
+1 -1
View File
@@ -30,7 +30,7 @@ for branch in "${branches_list[@]}"; do
exit 1; } exit 1; }
proceed='False' proceed='False'
while [[ "$proceed" == "False" ]]; do while [[ "$proceed" == "False" ]]; do
if git merge master; then if git merge -m 'Auto-merging via docker-versions-create' master; then
proceed="True" proceed="True"
echo "Branch $branch updated to current master successfully" echo "Branch $branch updated to current master successfully"
# pushing changes to remote for this branch # pushing changes to remote for this branch