Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 370389 - EGit does not show pull failure reason when conflict with locally changed file
Summary: EGit does not show pull failure reason when conflict with locally changed file
Status: CLOSED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: Core (show other bugs)
Version: 1.2   Edit
Hardware: PC Windows XP
: P3 normal (vote)
Target Milestone: 3.0   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-02-01 22:21 EST by Anil Gursel CLA
Modified: 2013-04-19 03:48 EDT (History)
2 users (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 Anil Gursel CLA 2012-02-01 22:21:57 EST 
Build Identifier: Version: Indigo Service Release 1 Build id: 20110916-0149  EGit: 1.2.0.x

If there is a conflict with a locally un-committed file after you do a pull, EGit does not provide the failure reason.  It just says "Failed".  This becomes very annoying because developers waste times to figure out what the problem is.

While git command line properly explains the situation: "error: Your local changes to 'xxxxx' would be overwritten by merge.  Aborting.
Please, commit your changes or stash them before you can merge."

This might be related to https://bugs.eclipse.org/bugs/show_bug.cgi?id=351430 but I do not get any exception.

Reproducible: Always

Steps to Reproduce:
1. On clone1, modify file A, commit and push.
2. On clone2, modify file A, but do not commit.
3. Do a git pull on clone2.
4. Egit says "Failed". But, it does tell why it failed.
Comment 1 Robin Rosenberg CLA 2013-04-19 03:47:33 EDT 
This was fixed in https://git.eclipse.org/r/#/c/11255/