public/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-02-19 14:28:28 +09:00
Code Issues Packages Projects Releases Wiki Activity
Files
e5ded0ee1907d0ee0415a2fd417e2554ecf2c948
gitea/routers/api
History
zeripath e5ded0ee19 Ensure that rebase conflicts are handled in updates (#16952) (#16960) 
Backport #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 18:54:13 +02:00
..
v1
Ensure that rebase conflicts are handled in updates (#16952) (#16960)
2021-09-05 18:54:13 +02:00