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

Compare commits

base: pablo:2779cb453c6d379c6d4fab0b8ec94f57d8fab585
Branches Tags
pablo:main
..
compare: pablo:ddf250b61a95ee9111efbec132470fca58986383
Branches Tags
pablo:main

No commits in common. "2779cb453c6d379c6d4fab0b8ec94f57d8fab585" and "ddf250b61a95ee9111efbec132470fca58986383" have entirely different histories.
2779cb453c ... ddf250b61a

1 changed files with 3 additions and 7 deletions
Show Stats Expand all files Collapse all files

10
docs/server-setup.md
View File

@ -400,17 +400,13 @@ rebuild:
```sh
cd ~/vienalatina
git pull --no-rebase --no-edit github <the-branch-name>
git pull --no-edit github <the-branch-name> # e.g. claude/relaxed-faraday-h4zd09
git push gitea main
sudo bash scripts/deploy-board.sh
```
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.
`--no-edit` accepts the default merge message. Without it git opens 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: