From b30b0fe5a639b99e65e6f97932416ea712cb70c7 Mon Sep 17 00:00:00 2001 From: andryyy Date: Sat, 30 May 2020 22:24:57 +0200 Subject: [PATCH] [Update] Update with "ours" is not recommended --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index b31c667f..63f6acb7 100755 --- a/update.sh +++ b/update.sh @@ -157,7 +157,7 @@ while (($#)); do echo './update.sh [-c|--check, --ours, --gc, --skip-start, -h|--help] -c|--check - Check for updates and exit (exit codes => 0: update available, 3: no updates) - --ours - Use merge strategy "ours" to solve conflicts in favor of non-mailcow code (local changes) + --ours - Use merge strategy "ours" to solve conflicts in favor of non-mailcow code (local changes over remote changes), not recommended! --gc - Run garbage collector to delete old image tags --no-update-compose - Do not update docker-compose --prefetch - Only prefetch new images and exit (useful to prepare updates)