RebaseDlg: Improved error handling on conflict handling

Signed-off-by: Sven Strickroth <email@cs-ware.de>