Summary

Pull Request workflow implements all steps except actual merge in backend. The merge is currently stubbed and returns HTTP 501 (Not Implemented).
Sztab backend and UI correctly invoke merge, enforce authorization and approval rules, but Sztabina does not yet perform the actual Git merge.

Current Behavior

• UI invokes POST /api/pullrequests/{id}/merge
• Backend:
  • Validates PR status (APPROVED)
  • Validates reviewer approvals
  • Validates authorization (author or ADMIN / PM)
  • Calls Sztabina via GitManipulationClient.mergeByUrl(...)
• Sztabina responds with 404 / Not Found
• Backend translates this to 501 Not Implemented
• UI displays branded error message:
  “Merge is not implemented yet”

This behavior is intentional and correct for now.

Expected Behavior

• Sztabina performs an actual Git merge:
  • base = target branch
  • head = source branch
• Merge result returned to backend
• Backend transitions PR to MERGED
• UI reflects merged state (badge, checkmark, disabled actions)

Scope of Work

1. Sztabina – Git Merge Implementation

• Add merge operation to Git service layer
• Support merge by repository URL + branch refs
• Execute merge using local Git engine
• Handle:
  • Fast-forward merge
  • Non-fast-forward merge
  • Merge conflicts
• Return structured merge result:
  • SUCCESS
  • CONFLICT
  • ERROR

2. Sztabina – API Endpoint

• Implement merge endpoint (currently stubbed / missing)
• Accept:
  • repository URL
  • base branch
  • head branch
• Return:
  • HTTP 200 on success
  • HTTP 409 on conflict
  • HTTP 500 on unexpected failure

3. Backend – Error Translation (Minor)

• Map merge conflict → HTTP 409
• Preserve 501 only if merge is truly unsupported
• No change to authorization / validation logic

4. Tests

• Sztabina unit tests for merge logic
• Sztabina API tests
• Backend integration test verifying:
  • Approved PR → merge success
  • Conflict → PR remains unmerged

Out of Scope

• UI conflict resolution
• Rebase / squash strategies
• Commit message customization
• Branch protection rules

Worklog (Planned)

Notes

• Backend and UI are already merge-ready
• This defect is isolated to Sztabina
• No schema changes required