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

Bug 351430

Summary: conflict with locally changed file durig pull exposes jgit exception in error dialog
Product: [Technology] EGit Reporter: Adrian Goerler <adrian.goerler>
Component: UIAssignee: Project Inbox <egit.ui-inbox>
Status: NEW --- QA Contact:
Severity: normal    
Priority: P3 CC: daniel_megert, gurselan, robin
Version: unspecified   
Target Milestone: ---   
Hardware: All   
OS: All   
Whiteboard:
Attachments:
Description Flags
screen shot of the error dialog none

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.