Bug 360635 - Rebase > Continue: confusing error message
Summary: Rebase > Continue: confusing error message
Status: NEW
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: 1.1   Edit
Hardware: PC Windows 7
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-10-12 05:28 EDT by Mathias Kinzler CLA
Modified: 2011-10-12 07:12 EDT (History)
1 user (show)

See Also:

Attachments
Error dialog (31.77 KB, image/jpeg)
2011-10-12 07:12 EDT, Mathias Kinzler CLA 		no flags Details
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
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