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

Bug 337525

Summary:	If rebase stops on a conflict this should be clearly shown in the result wizard
Product:	[Technology] EGit	Reporter:	Matthias Sohn <matthias.sohn>
Component:	UI	Assignee:	Matthias Sohn <matthias.sohn>
Status:	RESOLVED FIXED	QA Contact:
Severity:	enhancement
Priority:	P3	CC:	caniszczyk
Version:	0.12	Keywords:	noteworthy
Target Milestone:	0.12-M1
Hardware:	All
OS:	All
Whiteboard:

Description Matthias Sohn

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

2011-02-18 19:23:19 EST

code review http://egit.eclipse.org/r/#change,2536

Comment 2 Stefan Lay

2011-02-23 10:32:35 EST

Fixed with ce77683662b0c981b371337597ed507db9bbdc78