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-03-21 12:08:33.000000000

Uploaded patch set 3.

-------------------------------------
author: Brenden Conley
date: 2012-03-21 12:29:11.000000000

Patch Set 3:

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

-------------------------------------
author: Brenden Conley
date: 2012-03-21 12:30:38.000000000

Patch Set 3: Fails

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

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