pablo/vienalatina
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull with --no-rebase, because the branches really have diverged

Browse Source 
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 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01NizVpJ2dwzCbjCrTLCjeHn
This commit is contained in:
Claude 2026-09-25 18:55:30 +00:00
parent bf7ff3025a
commit 36247e7f35
No known key found for this signature in database
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/server-setup.md
View File

@ -400,13 +400,17 @@ rebuild:
```sh ```sh
cd ~/vienalatina cd ~/vienalatina
git pull --no-edit github <the-branch-name> # e.g. claude/relaxed-faraday-h4zd09 git pull --no-rebase --no-edit github <the-branch-name>
git push gitea main git push gitea main
sudo bash scripts/deploy-board.sh sudo bash scripts/deploy-board.sh
``` ```
`--no-edit` accepts the default merge message. Without it git opens an editor, Both flags earn their place. `main` and the branch have genuinely diverged —
which is a strange place to find yourself mid-deploy. 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: If `github` is not a remote yet, add it once — see the end of step 8: