Claude 36247e7f35 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 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01NizVpJ2dwzCbjCrTLCjeHn		2026-09-25 18:55:30 +00:00
..
server-setup.md	Pull with --no-rebase, because the branches really have diverged	2026-09-25 18:55:30 +00:00