Checkout conflict with files: etc ....

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 

你可能感兴趣的:(Checkout conflict with files: etc ....)