mirror of
https://github.com/go-gitea/gitea.git
synced 2026-09-18 04:52:47 +00:00
be7cde7539
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>