eclipse用github pull的时候总是报错

Question

我和同学一起做项目的时候用了github，然后现在总是有个这样的问题，就是我用clone url然后将项目导入到eclipse里的。但有时候就是他提交后，我pull的时候就总是报错，然后我就team——merge后——commit，但还是pull不行；然后就add to index后再pull也是不行。我想问就这是一种什么问题啊？然后需要怎么处理？才能避免我每次都要删掉整个project，然后重新再去clone导入这样。

Answer 1

So if you separate the functional modules that everyone needs to do, there won’t be so many conflicts.

Answer 2

The first point is that the conflicts you have are all binary files. Do not let the binary files generated by compilation enter the warehouse! Please add it to .gitignore to ignore

In addition, maybe you don’t know the correct way to use git

Generally speaking, you need to make a commit before pulling. If you think it is not yet commited (I personally think that the standard for commit is that it can have incomplete functions or errors, but it should be at least runnable), then Use stash to temporarily save it and then pull it

It is recommended to find an introductory tutorial on git first. You need to pay special attention to the workflow

Answer 3

conflict, there is a conflict. There is no need to upload the binary generated by compilation