Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 351430 - conflict with locally changed file durig pull exposes jgit exception in error dialog
Summary: conflict with locally changed file durig pull exposes jgit exception in error...
Status: NEW
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: unspecified   Edit
Hardware: All All
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-07-07 07:59 EDT by Adrian Goerler CLA
Modified: 2014-05-29 09:58 EDT (History)
3 users (show)

See Also:

Attachments
screen shot of the error dialog (47.65 KB, image/png)
2011-07-07 08:00 EDT, Adrian Goerler 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 Adrian Goerler CLA 2011-07-07 07:59:23 EDT 
If I locally change a file, which has been remotely changed, a pull will yield to a conflict, which will prevent the rebase or merge. This conflict is displayed by an error dialog box reporting that a JGit CheckoutException has occurred (see attachement). This error dialog seems inappropriate.
Comment 1 Adrian Goerler CLA 2011-07-07 08:00:05 EDT 
Created attachment 199252 [details]
screen shot of the error dialog
Comment 2 Dani Megert CLA 2011-12-13 09:43:54 EST 
A better message should be displayed and nothing written to .log.