eclipse中git pull拉取报错Checkout conflict with files

今天在eclipse pull同步代码时git报错大致是Checkout conflict with files今天在eclipse pull同步代码时git报错大致是Checkout confli