Scaled-Tech-Consulting/Gitea-Tools
2
0
Fork 0
Code Issues 76 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge pull request 'feat: add conflict-fix leases and stale-head protection (Closes #399)' (#416) from feat/issue-399-conflict-fix-leases into master

Browse Source
This commit was merged in pull request #416.
This commit is contained in:
sysadmin
2026-07-08 00:34:20 -05:00
parent cc5686b896 d4dc9aa854
commit ae0478bf54
14 changed files with 1246 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skills/llm-project-workflow/workflows/review-merge-pr.md
+18
View File
@@ -752,6 +752,24 @@ inventory before continuing.
Final reports must include lease session id, acquisition proof, heartbeat
status, and release/blocked status.
## 26C. Conflict-fix lease and stale-head protection (#399)
Before validating, approving, or merging a PR:
1. Check for an active conflict-fix lease on the PR; stop if one is active.
2. Pin `expected_head_sha` before validation and pass it to
`gitea_mark_final_review_decision`, `gitea_submit_pr_review`, and
`gitea_merge_pr`.
3. Re-fetch live PR head immediately before approval and merge; refuse when
live head differs from the reviewed SHA.
Final reports must state:
* reviewed head SHA
* final live head SHA before approval
* final live head SHA before merge
* whether any push occurred during validation
## 27. Merge rules
Before merge, rerun fresh live checks: