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: Juliet Cantu
date: 2013-01-20 21:04:55.000000000

Uploaded patch set 11.

-------------------------------------
author: Brenden Conley
date: 2013-01-20 21:05:01.000000000

Patch Set 11:

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

-------------------------------------
author: Brenden Conley
date: 2013-01-20 21:17:15.000000000

Patch Set 11: Verified

Build Successful 

https://hudson.eclipse.org/sandbox/job/egit.gerrit/4043/ : SUCCESS

-------------------------------------
author: Juliet Cantu
date: 2013-01-20 21:18:26.000000000

Patch Set 11: Looks good to me, approved; IP review completed



-------------------------------------
author: Juliet Cantu
date: 2013-01-20 21:18:28.000000000

Change has been successfully merged into the git repository.

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