DESCRIPTION

Properly handle checkout conflict exceptions

Properly handle a possible checkout conflict exception and display a
suiting dialog to the user also when merging and rebasing.

Still to be done: merge/rebase triggered through pull

JGit-Dependency: I48d9bdcc1e98095576513a54a225a42409f301f3
Change-Id: I23780261308a6ce614355e724e7dbf0dfb4d35a7

COMMENTS

author: Bryanna Douglas
date: 2012-04-02 06:21:40.000000000

Uploaded patch set 5.

-------------------------------------
author: Brenden Conley
date: 2012-04-02 06:34:04.000000000

Patch Set 5:

Build Started https://hudson.eclipse.org/sandbox/job/egit.gerrit/2790/ 

-------------------------------------
author: Brenden Conley
date: 2012-04-02 06:35:36.000000000

Patch Set 5: Fails

Build Failed 
 
https://hudson.eclipse.org/sandbox/job/egit.gerrit/2790/ : FAILURE

-------------------------------------
