fix: Fetch remote before merge/push in initiative approval

approveInitiative was merging and pushing with a stale local
defaultBranch, causing "rejected (fetch first)" when origin/main
had advanced since the last project sync. Now fetches remote and
fast-forwards the target branch before merging.
This commit is contained in:
Lukas May
2026-03-06 11:59:16 +01:00
parent 1e723611e7
commit 2814c2d3b2
4 changed files with 37 additions and 0 deletions

View File

@@ -49,6 +49,8 @@ function createMocks() {
getMergeBase: vi.fn().mockResolvedValue('abc123'),
pushBranch: vi.fn(),
checkMergeability: vi.fn().mockResolvedValue({ mergeable: true }),
fetchRemote: vi.fn(),
fastForwardBranch: vi.fn(),
};
const phaseRepository = {