DESCRIPTION

Fix CCE handling when rebasing and merging

Propperly handle a possible CCE and display a suiting dialog to the
user, which informs about the problem.

Change-Id: I23780261308a6ce614355e724e7dbf0dfb4d35a7


COMMENTS

author: Brenden Conley
date: 2012-03-16 13:21:19.000000000

Patch Set 1:

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

-------------------------------------
author: Brenden Conley
date: 2012-03-16 13:22:48.000000000

Patch Set 1: Fails

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

-------------------------------------
author: Douglas Trujillo
date: 2012-03-16 16:40:19.000000000

Patch Set 1: I would prefer that you didn't submit this

(3 inline comments)

few formal issues, still need to test this change

Line:1, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CheckoutConflictDialog.java -> missing license header

Line:9, /COMMIT_MSG -> typo: s/Propperly/Properly/

don't use non-commonly used abbrevations (CCE) instead you may use a title like:

"Properly handle checkout conflict exceptions"

and put all additional information into the commit message body.

Line:11, /COMMIT_MSG -> please add a footer referencing the jgit change needed to compile this change:

JGit-Dependency: I48d9bdcc1e98095576513a54a225a42409f301f3

-------------------------------------
author: Bryanna Douglas
date: 2012-03-19 07:25:57.000000000

Patch Set 1: (3 inline comments)

thanks for the review!

Line:1, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CheckoutConflictDialog.java -> Done

Line:9, /COMMIT_MSG -> Done

Line:11, /COMMIT_MSG -> Done

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