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-09-12 08:38:57.000000000

Uploaded patch set 8.

-------------------------------------
author: Bryanna Douglas
date: 2012-09-12 08:43:16.000000000

Patch Set 8:

rebased

-------------------------------------
author: Brenden Conley
date: 2012-09-12 09:24:50.000000000

Patch Set 8:

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

-------------------------------------
author: Brenden Conley
date: 2012-09-12 09:25:52.000000000

Patch Set 8: Fails

Build Failed 

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

-------------------------------------
author: Bryanna Douglas
date: 2012-09-14 06:09:51.000000000

Patch Set 8:

1. I have authored 100% of the content I'm contributing 2. I have the rights to donate the content to Eclipse 3. I contribute the content under the EDL

-------------------------------------
author: Douglas Trujillo
date: 2012-09-14 09:16:04.000000000

Patch Set 8:

egit is under EPL license (not EDL) so your assertion needs to be amended in order to be valid for an egit patch

-------------------------------------
author: Bryanna Douglas
date: 2012-09-14 09:24:20.000000000

Patch Set 8:

1. I have authored 100% of the content I'm contributing 2. I have the rights to donate the content to Eclipse 3. I contribute the content under the EPL

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