docs(git): Gitea mirror sync when push is non-fast-forward
Made-with: Cursor
This commit is contained in:
23
scripts/git/README-gitea-proxmox-sync.md
Normal file
23
scripts/git/README-gitea-proxmox-sync.md
Normal file
@@ -0,0 +1,23 @@
|
||||
# Syncing `master` with `gitea` remote (d-bis/proxmox)
|
||||
|
||||
If **`git push gitea master`** fails with **non-fast-forward**, local and **gitea.d-bis.org/d-bis/proxmox** have **diverged**.
|
||||
|
||||
```bash
|
||||
cd /path/to/proxmox
|
||||
git fetch gitea
|
||||
git log --oneline --left-right master...gitea/master | head -40
|
||||
```
|
||||
|
||||
Resolve by either:
|
||||
|
||||
1. **Merge** (preserves both histories):
|
||||
`git pull gitea master --no-rebase`
|
||||
fix conflicts, then `git push gitea master` and `git push origin master` as needed.
|
||||
|
||||
2. **Rebase** (linear history; use only if your team agrees):
|
||||
`git pull gitea master --rebase`
|
||||
then push both remotes.
|
||||
|
||||
Do **not** force-push to **gitea** unless you intend to rewrite shared history.
|
||||
|
||||
CyberSecur-related commits exist on **GitHub `origin`**; **gitea** may lack them until a successful merge and push.
|
||||
Reference in New Issue
Block a user