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-07-05 07:39:23.000000000

Uploaded patch set 7.

-------------------------------------
author: Brenden Conley
date: 2012-07-05 07:54:47.000000000

Patch Set 7:

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

-------------------------------------
author: Brenden Conley
date: 2012-07-05 07:55:55.000000000

Patch Set 7: Fails

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

-------------------------------------
author: Danika Greer
date: 2012-07-08 21:57:33.000000000

Patch Set 7:

Could you get rid of the unrelated formatting changes please?

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