From 2e3d5f4dbe4ff8c5c747a8cb49ade2bfd3c9a1f3 Mon Sep 17 00:00:00 2001 From: Adam French Date: Tue, 7 Apr 2026 13:40:08 +0100 Subject: [PATCH] Use fetch+reset in deploy workflow to avoid merge conflicts Co-Authored-By: Claude Opus 4.6 --- .gitea/workflows/deploy.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 1336517..d13c40b 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -14,7 +14,8 @@ jobs: GIT_SSH_COMMAND: "ssh -o StrictHostKeyChecking=no" run: | git config --global --add safe.directory /home/adamf/deploy/web_server - git pull ssh://git@localhost:2222/adamf/web_server.git main + git fetch ssh://git@localhost:2222/adamf/web_server.git main + git reset --hard FETCH_HEAD - name: Run docker compose up working-directory: /home/adamf/deploy/web_server