From 99df78664eab1ec3758998b491c2128f2ffb557e Mon Sep 17 00:00:00 2001 From: Erich Blume Date: Sun, 29 Mar 2026 08:22:11 -0700 Subject: [PATCH] Note upstream history rewrite as a spork sync failure mode Co-Authored-By: Claude Opus 4.6 (1M context) --- docs/how-to/configuration/manage-spork-branches.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/how-to/configuration/manage-spork-branches.md b/docs/how-to/configuration/manage-spork-branches.md index 82778ef..7bcf4fc 100644 --- a/docs/how-to/configuration/manage-spork-branches.md +++ b/docs/how-to/configuration/manage-spork-branches.md @@ -98,7 +98,7 @@ git push --force-with-lease origin feature/upstream/my-change The next mirror-sync run will pick up the resolved branch and rebuild `deploy`. -**TODO:** Rebase failures are currently only visible in the Forgejo Actions UI. Alerting via Grafana is planned but not yet implemented. +**TODO:** Workflow failures — whether from rebase conflicts or upstream history rewrites (force-push on main) — are currently only visible in the Forgejo Actions UI. Alerting via Grafana is planned but not yet implemented. ## Future: `.spork.toml`