fix(repo): surface unrelated histories on Sync Fork (#39258)

Sync Fork already maps merge conflicts to a JSON error. Unrelated
histories still went through `ServerError`, so the UI showed a 500 HTML
snippet instead of the same user-facing message PR merge already uses
(`repo.pulls.unrelated_histories`).

The API path returned 500 for the same git error; PR merge returns 409.
Match that.

Fixes #36772

AI assistance was used to locate the handler gap and draft the mapping.
I reviewed and take responsibility for the change.

Signed-off-by: Zhaoqi Xu <lzy00419@outlook.com>
This commit is contained in:
Zhaoqi Xu
2026-09-17 12:25:43 +00:00
committed by GitHub
parent afb7edef07
commit be7cde7539
4 changed files with 14 additions and 0 deletions
+3
View File
@@ -27155,6 +27155,9 @@
},
"404": {
"$ref": "#/components/responses/notFound"
},
"409": {
"$ref": "#/components/responses/error"
}
},
"summary": "Merge a branch from upstream",
+3
View File
@@ -14997,6 +14997,9 @@
},
"404": {
"$ref": "#/responses/notFound"
},
"409": {
"$ref": "#/responses/error"
}
}
}