mirror of
https://github.com/go-gitea/gitea.git
synced 2024-12-09 05:33:37 +08: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> |
||
---|---|---|
.. | ||
v1 |