You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
.../api/v1/repo/pull.go:1140:UpdatePullRequest() [E] pull_service.Update: Rebase Error: exit status 1: Whilst Rebasing: <commit hash>
Rebasing (1/1)\01503derror: could not apply <commit hash>... change README.md
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 5a5fa47... change README.md
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Completed POST /api/v1/repos/qwerty287/tests/pulls/1/update?style=rebase 500 Internal Server Error in 258.618144ms
Description
If I try to update a PR with conflicts via rebase (using the API), I get a 500 error. If I use the default merge option, I get a 409 Conflict error, which is better. It would be nice if it could return a 409 error if the PR contains conflicts.
The text was updated successfully, but these errors were encountered:
PR go-gitea#16125 did not update the error handlers to handle conflict errors relating
to rebases. This PR adds them.
Fixgo-gitea#16922
Signed-off-by: Andrew Thornton <[email protected]>
PR #16125 did not update the error handlers to handle conflict errors relating
to rebases. This PR adds them.
Fix#16922
Signed-off-by: Andrew Thornton <[email protected]>
zeripath
added a commit
to zeripath/gitea
that referenced
this issue
Sep 5, 2021
Backport #16952
PR #16125 did not update the error handlers to handle conflict errors relating
to rebases. This PR adds them.
Fix#16922
Signed-off-by: Andrew Thornton <[email protected]>
[x]
):Description
If I try to update a PR with conflicts via
rebase
(using the API), I get a 500 error. If I use the default merge option, I get a 409 Conflict error, which is better. It would be nice if it could return a 409 error if the PR contains conflicts.The text was updated successfully, but these errors were encountered: