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.

JGit-Dependency: I48d9bdcc1e98095576513a54a225a42409f301f3
Change-Id: I23780261308a6ce614355e724e7dbf0dfb4d35a7
Signed-off-by: Juliet Cantu xxx@xxx.xxx


COMMENTS

author: Brenden Conley
date: 2013-01-20 19:11:38.000000000

Patch Set 10:

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

-------------------------------------
author: Brenden Conley
date: 2013-01-20 19:12:32.000000000

Patch Set 10: Fails

Build Failed 

https://hudson.eclipse.org/sandbox/job/egit.gerrit/4042/ : FAILURE

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