From 36247e7f35205b363ac01a779f7c397103221562 Mon Sep 17 00:00:00 2001 From: Claude Date: Fri, 25 Sep 2026 18:55:30 +0000 Subject: [PATCH] Pull with --no-rebase, because the branches really have diverged main carries the previous deploy's merge commit and the branch carries the new work, so a git with no pull.rebase configured stops with "fatal: Need to specify how to reconcile divergent branches" and fetches without merging. --no-edit does not answer that question; --no-rebase does. Co-Authored-By: Claude Opus 5 Claude-Session: https://claude.ai/code/session_01NizVpJ2dwzCbjCrTLCjeHn --- docs/server-setup.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/server-setup.md b/docs/server-setup.md index 4c0a378..0c78681 100644 --- a/docs/server-setup.md +++ b/docs/server-setup.md @@ -400,13 +400,17 @@ rebuild: ```sh cd ~/vienalatina -git pull --no-edit github # e.g. claude/relaxed-faraday-h4zd09 +git pull --no-rebase --no-edit github git push gitea main sudo bash scripts/deploy-board.sh ``` -`--no-edit` accepts the default merge message. Without it git opens an editor, -which is a strange place to find yourself mid-deploy. +Both flags earn their place. `main` and the branch have genuinely diverged — +main carries the previous merge, the branch carries the new work — and a git +with no `pull.rebase` set refuses to guess, with *"fatal: Need to specify how to +reconcile divergent branches."* `--no-rebase` says merge, which is what every +deploy here has done. `--no-edit` then accepts the default merge message instead +of opening an editor, which is a strange place to find yourself mid-deploy. If `github` is not a remote yet, add it once — see the end of step 8: