tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-09-28 03:28:13 +00:00
Code Releases Activity
Files
eb0330a3fe3983c9c5863f2efb2129e691818926
gitea/routers/api
History
zeripath eb0330a3fe Ensure that rebase conflicts are handled in updates (#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 <art27@cantab.net>
2021-09-05 10:30:40 +01:00
..
v1
Ensure that rebase conflicts are handled in updates (#16952)
2021-09-05 10:30:40 +01:00