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