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

Bug 366178

Summary:

Simplify Merge Result dialog in case of no action

Product:

[Technology] EGit

Reporter:

Dani Megert <daniel_megert>

Component:

Assignee:

Project Inbox <egit.ui-inbox>

Status:

RESOLVED FIXED

QA Contact:

Severity:

enhancement

Priority:

CC:

matthias.sohn, robin, thomas.bieser

Version:

1.2

Target Milestone:

3.2

Hardware:

All

OS:

All

Whiteboard:

Attachments:

Description	Flags
Picture of Merge Result dialog	none

Description Dani Megert

2011-12-09 06:32:32 EST

Simplify Merge Result dialog in case of no action.

The current dialog shows too much information and can be misleading:

At the top the result says: "Already-up-to-date", but below it says:
New HEAD <commit here>

==> "new" contradicts with up-to-date.

As simple dialog, saying that there was nothing to merge would be better.

Comment 1 Dani Megert

2011-12-09 06:33:35 EST

Created attachment 208162 [details]
Picture of Merge Result dialog

Comment 2 Robin Stocker

2013-07-18 14:36:49 EDT

There are also other results where there is no "New HEAD". Fix:

https://git.eclipse.org/r/14667

Comment 3 Robin Stocker

2013-09-27 12:28:34 EDT

*** Bug 336087 has been marked as a duplicate of this bug. ***

Comment 4 Matthias Sohn

2013-10-22 19:02:30 EDT

merged as b08e72c64ef91c41f67fca9894c9e20fb89aa69e