amorfo77/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2026-02-23 17:46:23 +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:21 -06:00
parent 2673d1c921 97874f3481
commit ee97808168
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker-versions-create.sh
View File

@@ -30,7 +30,7 @@ for branch in "${branches_list[@]}"; do
exit 1; }
proceed='False'
while [[ "$proceed" == "False" ]]; do
if git merge master; then
if git merge -m 'Auto-merging via docker-versions-create' master; then
proceed="True"
echo "Branch $branch updated to current master successfully"
# pushing changes to remote for this branch