Lavande/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-12-23 20:01:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
eb0330a3fe3983c9c5863f2efb2129e691818926
gitea/routers/api/v1/repo/pull.go
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

36 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink