Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 366178 - Simplify Merge Result dialog in case of no action
Summary: Simplify Merge Result dialog in case of no action
Status: RESOLVED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: 1.2   Edit
Hardware: All All
: P3 enhancement (vote)
Target Milestone: 3.2   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
: 336087 (view as bug list)
Depends on:
Blocks:
 
Reported: 2011-12-09 06:32 EST by Dani Megert CLA
Modified: 2013-10-22 19:02 EDT (History)
3 users (show)

See Also:

Attachments
Picture of Merge Result dialog (5.70 KB, image/png)
2011-12-09 06:33 EST, Dani Megert 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 Dani Megert CLA 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 CLA 2011-12-09 06:33:35 EST 
Created attachment 208162 [details]
Picture of Merge Result dialog
Comment 2 Robin Stocker CLA 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 CLA 2013-09-27 12:28:34 EDT 
*** Bug 336087 has been marked as a duplicate of this bug. ***
Comment 4 Matthias Sohn CLA 2013-10-22 19:02:30 EDT 
merged as b08e72c64ef91c41f67fca9894c9e20fb89aa69e