An error occurred
PR #16125 An error occurred did not update the error handlers to handle conflict errors relating to rebases. This PR adds them. Fix #16922 An error occurred Signed-off-by: Andrew Thornton <art27@cantab.net>