2
0
Эх сурвалжийг харах

[Update] Update with "ours" is not recommended

andryyy 5 жил өмнө
parent
commit
b30b0fe5a6
1 өөрчлөгдсөн 1 нэмэгдсэн , 1 устгасан
  1. 1 1
      update.sh

+ 1 - 1
update.sh

@@ -157,7 +157,7 @@ while (($#)); do
     echo './update.sh [-c|--check, --ours, --gc, --skip-start, -h|--help]
     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)
   -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
   --gc                 -   Run garbage collector to delete old image tags
   --no-update-compose  -   Do not update docker-compose
   --no-update-compose  -   Do not update docker-compose
   --prefetch           -   Only prefetch new images and exit (useful to prepare updates)
   --prefetch           -   Only prefetch new images and exit (useful to prepare updates)