Update i_u_m_update.md

Dieser Commit ist enthalten in:
André Peters 2020-05-30 22:38:23 +02:00 committet von GitHub
Ursprung cafe0c94e0
Commit 54aed163c1
Es konnte kein GPG-SchlĂĽssel zu dieser Signatur gefunden werden
GPG-SchlĂĽssel-ID: 4AEE18F83AFDEB23

Datei anzeigen

@ -33,8 +33,8 @@ Some minor conflicts will be auto-corrected (in favour for the mailcow: dockeriz
# - Run garbage collector to cleanup old image tags and exit
./update.sh --gc
# - Update with merge strategy "ours" instead of "theirs"
# This will merge in favor for your local changes, should be avoided
# - Update with merge strategy option "ours" instead of "theirs"
# This will **solve conflicts** when merging in favor for your local changes and should be avoided. Local changes will always be kept, unless we changed file XY, too.
./update.sh --ours
# - Don't update, but prefetch images and exit