Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 360635

Summary: Rebase > Continue: confusing error message
Product: [Technology] EGit Reporter: Mathias Kinzler <mathias.kinzler>
Component: UIAssignee: Project Inbox <egit.ui-inbox>
Status: NEW --- QA Contact:
Severity: normal    
Priority: P3 CC: remy.suen
Version: 1.1   
Target Milestone: ---   
Hardware: PC   
OS: Windows 7   
Whiteboard:
Attachments:
Description Flags
Error dialog none

Description Mathias Kinzler CLA 2011-10-12 05:28:47 EDT 
Attached is the screenshot from the error popup displayed when trying to continue a rebase which has unmerged conflicts. This is highly confusing for the "normal" user. The error message should say something like

One or several files with rebase conflicts have not been marked as being resolved. Please make sure to use the "Add" action on these files after resolving the conflicts and try again.

In the "Details" section, a list of these files could be shown, but that's probably not too important.
Comment 1 Remy Suen CLA 2011-10-12 06:39:13 EDT 
(In reply to comment #0)
> Attached is the screenshot from the error popup displayed when trying to
> continue a rebase which has unmerged conflicts.

Mathias, there is nothing attached to this bug.
Comment 2 Mathias Kinzler CLA 2011-10-12 07:12:35 EDT 
Created attachment 205016 [details]
Error dialog