"Sylvain PRAS" <email@example.com> wrote in message
>I often have this error during Pull :
> Exception caught during execution of merge command.
> org.eclipse.jgit.errors.CheckoutConflictException: Checkout conflict with
> files: etc ....
> It happen when i have a modified file in my working directory, and there's
> a concurrent modification on the same file in the remote repository.
> Why Egit doesn't manage to pass the file in merge satus, to let us resolve
> conflicts ?
This is done on purpose, and is the same in native git. The merge which is
done during pull already merges the file from the pulled branch with the
file in your HEAD commit. When there are additional changes in your working
directory or even in your index, the merge would be way too complex.