github eclipse报错记录

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

 

posted @ 2015-05-15 15:41  阿刻  阅读(2108)  评论(0)  编辑  收藏  举报