结帐冲突与文件git pull

Yesterday I made a pull in Eclipse from my team repository and it worked perfectly. But today I have tried to pull and the following message appears:Yesterday I made a pull in Eclipse from my team