RebaseDlg: Improved error handling on conflict handling