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

Bug 359259

Summary: failed merge with no explanation
Product: [ECD] Orion Reporter: Susan McCourt <susan>
Component: GitAssignee: Project Inbox <orion.git-inbox>
Status: CLOSED DUPLICATE QA Contact:
Severity: normal    
Priority: P3    
Version: unspecified   
Target Milestone: ---   
Hardware: PC   
OS: Windows 7   
Whiteboard:
Attachments:
Description Flags
screenshot none

Description Susan McCourt CLA 2011-09-28 11:32:50 EDT 
I was trying to fetch/merge this morning.
From the clones page, I got "FAILED.  Go to git status page" in the progress message.

Went to git status.
Tried the merge.
Same message.  

1.  I'm already on git status
2.  There is no error code or further information to tell me why I can't merge
3.  The icon is a warning icon, but FAILED is an error condition.

What do I do at this point?
Comment 1 Susan McCourt CLA 2011-09-28 11:33:22 EDT 
Created attachment 204197 [details]
screenshot
Comment 2 Susan McCourt CLA 2011-09-28 11:47:53 EDT 
I have unstaged changes so I think this is just a case of bug 356918.

In bug 355549 comment 5 Tomasz said 
>I'm aware that the UI part can be done better, so if you don't like feel 
>free to open a new bug for that part.

So I guess this can be that bug.  Should we detect when the working tree is dirty and then guess the problem?  

For sure, FAILED with a warning icon leaves me thinking the problem is worse than it is.
Comment 3 Susan McCourt CLA 2011-09-28 12:42:42 EDT 
(In reply to comment #2)
> Should we detect when the working tree is
> dirty and then guess the problem?  

For 0.3 we could have the FAIL message link to a tips and tricks page.  See bug 359271.
Comment 4 John Arthorne CLA 2011-09-28 16:26:39 EDT 

*** This bug has been marked as a duplicate of bug 357860 ***