cybercyst/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-05-31 23:25:13 +00:00
Code Issues Projects Releases Wiki Activity
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