From c963bb5ee17df5095437f42373d853e30bdfd683 Mon Sep 17 00:00:00 2001 From: Xiaoxia AI Date: Thu, 25 Jun 2026 01:58:53 +0800 Subject: [PATCH] docs(ops): record protected release guardrail --- .learnings/ERRORS.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.learnings/ERRORS.md b/.learnings/ERRORS.md index 6349d9e2d..f05167b91 100644 --- a/.learnings/ERRORS.md +++ b/.learnings/ERRORS.md @@ -66,3 +66,10 @@ Recover host first, stop residual build/runner tasks, verify production/staging - Error: sh/bash command not found in the PowerShell runtime. - Fix: run POSIX shell syntax checks via an available Linux host/container, e.g. scp to xiaoxia-server and run sh -n on a temporary file. + +## 2026-06-25 - Protected main release must not be direct-merged locally + +- Failed action: attempted local develop->main merge and tag push for v0.1.51. +- Errors: main branch is protected from direct push; local main had divergence/conflicts; tag v0.1.51 was pushed from the wrong local main HEAD and then removed. +- Fix: never tag production before protected main has accepted the release commit. Use PR/approved merge path or Gitea API merge, then tag the actual merged main commit. +