Hi,
thanks for your feedback. The use case for this extension is to more easily deal with conflicting checkouts in a Git GUI tool. Currently, either the whole operation is rejected or it will override/delete all conflicting work directory entries, With a partially checked out conflicting commit where only the conflicting files are not checked out, users should be able to resolve the remaining conflicts in a compare/synchronize view if necessary.
The workflow could be something like this:
1. user attempts to check out commit x
2. the tool figures out that there are conflicts and asks to check out all non-conflicting files
3. if the user agrees, the tool provides a compare/synchronize UI to resolve the remaining conflicts
If you agree, I will work on the comments you gave and upload another patch for review.
Best,
Rüdiger
From: Matthias Sohn <matthias.sohn@xxxxxxxxx>
To: R�diger Herrmann <ruediger.herrmann@xxxxxx>
Cc: JGit Developers List <jgit-dev@xxxxxxxxxxx>
Sent: Thursday, June 9, 2016 9:39 AM
Subject: Re: [jgit-dev] Extend DirCacheCheckout to skip conflicts