Exception caught during execution of merge command. org.eclipse.jgit.errors.CheckoutConflictException: Checkout conflict with files: etc ....
解决方案：
I suspected that i should commit my modificatons in the local repository before "pulling"; you confirm that.
pull > commit
Repository State:Conflicts
解决方案：
Go to Team > Add To Index. then Rebase > Continue Rebase
then commit in Your Local Master and Push