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>tokarchuk/v1.17
parent
4c7a70b348
commit
eb0330a3fe
Loading…
Reference in new issue