secana/ForgejoKit
3
11
Fork
You've already forked ForgejoKit
3

fix: preserve merge error context #3

Merged
secana merged 1 commit from pdurlej/ForgejoKit:codex/preserve-merge-error-context into main 2026年05月17日 21:19:41 +02:00
Contributor
Copy link

Problem

  • Merge failures currently collapse 405 and 409 responses to generic ServiceError cases, even when Forgejo returns a useful response body.

Change

  • Keeps the existing notMergeable and mergeConflict fallbacks for empty responses.
  • Preserves non-empty Forgejo response bodies as ServiceError.httpError for merge failures.
  • Extracts the common JSON message field for clearer LocalizedError descriptions.

Tests

  • DEVELOPER_DIR=/Applications/Xcode.app/Contents/Developer swift test
Problem - Merge failures currently collapse 405 and 409 responses to generic ServiceError cases, even when Forgejo returns a useful response body. Change - Keeps the existing notMergeable and mergeConflict fallbacks for empty responses. - Preserves non-empty Forgejo response bodies as ServiceError.httpError for merge failures. - Extracts the common JSON message field for clearer LocalizedError descriptions. Tests - DEVELOPER_DIR=/Applications/Xcode.app/Contents/Developer swift test
Sign in to join this conversation.
No reviewers
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
secana/ForgejoKit!3
Reference in a new issue
secana/ForgejoKit
No description provided.
Delete branch "pdurlej/ForgejoKit:codex/preserve-merge-error-context"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?