style nit: we don't use curly braces around single line blocks

CheckoutConflictException shouldn't be wrapped as an internal exception. Could you check why JGit doesn't throw the API exception org.eclipse.jgit.api.errors.CheckoutConflictException instead ?