记一web项目中eclipse在pull时出现Checkout conflict with files错误的问题