zeripath e5ded0ee19 Ensure that rebase conflicts are handled in updates (#16952) (#16960) ... Backport #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 18:54:13 +02:00
..
v1	Ensure that rebase conflicts are handled in updates (#16952) (#16960)	2021-09-05 18:54:13 +02:00