mirror of
https://github.com/go-gitea/gitea
synced 2025-01-11 18:24:27 +00:00
eb0330a3fe
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 <art27@cantab.net>