You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		3 years ago
..
v1	Ensure that rebase conflicts are handled in updates (#16952)	3 years ago