The change I wanted to trigger will take some time, because it's an API change which can come only in a new major release. Therefore I suggest that you fix it like you proposed it here. You have to check that e.getCause() returns back a org.eclipse.jgit.errors.CheckoutConflictException . That's what you propose here. So +1 from me. Just fix the style nit about curly braces.