Bug 337525 - If rebase stops on a conflict this should be clearly shown in the result wizard
Summary: If rebase stops on a conflict this should be clearly shown in the result wizard
Status: RESOLVED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: 0.12   Edit
Hardware: All All
: P3 enhancement (vote)
Target Milestone: 0.12-M1   Edit
Assignee: Matthias Sohn CLA
QA Contact:
URL:
Whiteboard:
Keywords: noteworthy
Depends on:
Blocks:
 
Reported: 2011-02-18 03:44 EST by Matthias Sohn CLA
Modified: 2011-02-23 10:32 EST (History)
1 user (show)

See Also:

Attachments
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 Matthias Sohn CLA 2011-02-18 03:44:44 EST 
Currently if rebase stops on a conflict the wizard coming up has the title line "Rebase: STOPPED" and only half a page lower I can see that there are conflicts. This could be improved by stating that there are conflicts also in the title line.
Comment 1 Matthias Sohn CLA 2011-02-18 19:23:19 EST 
code review http://egit.eclipse.org/r/#change,2536
Comment 2 Stefan Lay CLA 2011-02-23 10:32:35 EST 
Fixed with ce77683662b0c981b371337597ed507db9bbdc78