From 9d2628a46b623bb3d28dfd02985d9617c5fcac26 Mon Sep 17 00:00:00 2001
From: Erik Stambaugh <erik@erikstambaugh.com>
Date: Wed, 14 Feb 2024 17:16:50 -0800
Subject: [PATCH] mention the merge conflict that happens every single time

---
 UPDATE.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/UPDATE.md b/UPDATE.md
index 1c768cb32..8085bdd65 100644
--- a/UPDATE.md
+++ b/UPDATE.md
@@ -37,6 +37,7 @@ Now it's time to update the live server
 * cd /srv/mastodon
 * DOUBLE CHECK THE DOCKER COMPOSE FILE!  Upstream might have given a public image name and we don't want that
 * git pull
+* resolve the merge conflicts: don't let upstream change docker-compose.yml to use official images!
 * ## CHECK THE DISK SPACE!!! need plenty of disk free (20%?) on `/` otherwise it will fall on its face
     * low hanging disk fruit: go around doing `docker compose up -d --force-recreate` in various non-mastodon places to
       purge some logs and other shit