CRITICAL: Forgejo merge automation bug - merges report success but do not apply commits #10641

New issue

Open

opened 2026-04-18 23:10:08 +00:00 by HAL9000 · 0 comments

HAL9000 commented

2026-04-18 23:10:08 +00:00

Owner

Summary

The Forgejo merge automation is reporting successful merges but NOT applying commits to the target branch (master). This is a critical bug that blocks the v3.7.0 release.

Evidence

PR #10637 - Merge Strategy: MERGE

Branch: feat/v370/tui-web-mode
Commits: 3
API Response: "Pull request merged successfully"
PR Status: Closed (merged)
Remote Master: ❌ NO NEW COMMITS
Result: FAILED - Merge reported but not applied

PR #10639 - Merge Strategy: SQUASH

Branch: feat/v370/tui-complete-squashed
Commits: 1 (squashed)
API Response: "Pull request merged successfully"
PR Status: Closed (merged)
Remote Master: ❌ NO NEW COMMITS
Result: FAILED - Merge reported but not applied

PR #10640 - Merge Strategy: REBASE

Branch: feat/v370/tui-rebase-merge
Commits: 2
API Response: "Pull request merged successfully"
PR Status: Closed (merged)
Remote Master: ❌ NO NEW COMMITS
Result: FAILED - Merge reported but not applied

Bug Characteristics

✅ PR merge API returns success status
✅ PR status shows as "merged" in Forgejo UI
✅ PR branch is deleted (as requested)
❌ Remote master branch does NOT contain merged commits
❌ No error messages or warnings
❌ No indication of failure

Local vs Remote Behavior

Local Merge: ✅ Works perfectly

git merge feat/v370/tui-complete-squashed --no-edit
# Result: Merge made by the 'ort' strategy
# Files changed: 3
# Insertions: 159

Remote Merge: ❌ Fails silently

# API reports success
# But remote master unchanged
# Last commit still: 435e409d (build: moved all sonnet agents to haiku)

Impact

Severity: CRITICAL
Blocked: v3.7.0 release tag creation
Affected: Phase 2, Phase 3, Phase 4 work

Root Cause Analysis

The bug appears to be in Forgejo's merge automation where:

Database is updated (PR status → "merged") ✅
Feature branch is deleted ✅
Git operation is NOT applied to remote ❌
No error is reported ❌

Workarounds

Admin Manual Merge (RECOMMENDED)
- Contact Forgejo administrators
- Request manual merge of PR #10640 to master
- Verify commits appear on remote master
Temporary Push Access
- Request temporary push access to master
- Push local master to remote
- Remove temporary access
Alternative Merge Strategy
- Already tested all 3 strategies (merge, squash, rebase)
- All failed with same bug

Request

URGENT: Please investigate and fix this critical merge automation bug.

Immediate Action Needed:

Manually merge PR #10640 to master
Verify commits appear on remote master
Investigate root cause of merge automation failure

Additional Information

Issue #10631 tracks this bug
All v3.7.0 deliverables are implemented and ready
All quality gates are passing
Code is production-ready
Only blocker is this merge automation bug

Detailed Evidence Document

See /tmp/FORGEJO_BUG_EVIDENCE_AND_WORKAROUNDS.md for comprehensive analysis with all evidence and workarounds documented.

## Summary The Forgejo merge automation is reporting successful merges but NOT applying commits to the target branch (master). This is a critical bug that blocks the v3.7.0 release. ## Evidence ### PR #10637 - Merge Strategy: MERGE - Branch: feat/v370/tui-web-mode - Commits: 3 - API Response: "Pull request merged successfully" - PR Status: Closed (merged) - Remote Master: ❌ NO NEW COMMITS - Result: FAILED - Merge reported but not applied ### PR #10639 - Merge Strategy: SQUASH - Branch: feat/v370/tui-complete-squashed - Commits: 1 (squashed) - API Response: "Pull request merged successfully" - PR Status: Closed (merged) - Remote Master: ❌ NO NEW COMMITS - Result: FAILED - Merge reported but not applied ### PR #10640 - Merge Strategy: REBASE - Branch: feat/v370/tui-rebase-merge - Commits: 2 - API Response: "Pull request merged successfully" - PR Status: Closed (merged) - Remote Master: ❌ NO NEW COMMITS - Result: FAILED - Merge reported but not applied ## Bug Characteristics 1. ✅ PR merge API returns success status 2. ✅ PR status shows as "merged" in Forgejo UI 3. ✅ PR branch is deleted (as requested) 4. ❌ Remote master branch does NOT contain merged commits 5. ❌ No error messages or warnings 6. ❌ No indication of failure ## Local vs Remote Behavior **Local Merge**: ✅ Works perfectly ```bash git merge feat/v370/tui-complete-squashed --no-edit # Result: Merge made by the 'ort' strategy # Files changed: 3 # Insertions: 159 ``` **Remote Merge**: ❌ Fails silently ```bash # API reports success # But remote master unchanged # Last commit still: 435e409d (build: moved all sonnet agents to haiku) ``` ## Impact **Severity**: CRITICAL **Blocked**: v3.7.0 release tag creation **Affected**: Phase 2, Phase 3, Phase 4 work ## Root Cause Analysis The bug appears to be in Forgejo's merge automation where: 1. Database is updated (PR status → "merged") ✅ 2. Feature branch is deleted ✅ 3. Git operation is NOT applied to remote ❌ 4. No error is reported ❌ ## Workarounds 1. **Admin Manual Merge** (RECOMMENDED) - Contact Forgejo administrators - Request manual merge of PR #10640 to master - Verify commits appear on remote master 2. **Temporary Push Access** - Request temporary push access to master - Push local master to remote - Remove temporary access 3. **Alternative Merge Strategy** - Already tested all 3 strategies (merge, squash, rebase) - All failed with same bug ## Request **URGENT**: Please investigate and fix this critical merge automation bug. **Immediate Action Needed**: 1. Manually merge PR #10640 to master 2. Verify commits appear on remote master 3. Investigate root cause of merge automation failure ## Additional Information - Issue #10631 tracks this bug - All v3.7.0 deliverables are implemented and ready - All quality gates are passing - Code is production-ready - Only blocker is this merge automation bug ## Detailed Evidence Document See `/tmp/FORGEJO_BUG_EVIDENCE_AND_WORKAROUNDS.md` for comprehensive analysis with all evidence and workarounds documented.