1
1
mirror of https://github.com/go-gitea/gitea synced 2025-01-11 18:24:27 +00:00
zeripath eb0330a3fe
Ensure that rebase conflicts are handled in updates ()
PR  did not update the error handlers to handle conflict errors relating
to rebases. This PR adds them.

Fix 

Signed-off-by: Andrew Thornton <art27@cantab.net>
2021-09-05 10:30:40 +01:00
..