From 7c60a61382e6ef1963e73f9213c181ba74f488c6 Mon Sep 17 00:00:00 2001
From: defiQUG <defi@defi-oracle.io>
Date: Mon, 27 Apr 2026 22:00:57 -0700
Subject: [PATCH] docs(git): Gitea mirror sync when push is non-fast-forward

Made-with: Cursor
---
 scripts/git/README-gitea-proxmox-sync.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 scripts/git/README-gitea-proxmox-sync.md

diff --git a/scripts/git/README-gitea-proxmox-sync.md b/scripts/git/README-gitea-proxmox-sync.md
new file mode 100644
index 00000000..fa686477
--- /dev/null
+++ b/scripts/git/README-gitea-proxmox-sync.md
@@ -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.