GitHub's problems with eclipse

Six months ago because learning Git took a long time, six months passed, because not to use, basically all forget, recently in the company need to use Eclipse development related projects, using the early test data mining small algorithm, and regain git, but this time is not the command line mode, but the combination of eclipse. How to combine the two online has a lot of tutorials, but do not know whether it is their first use or go a lot of detours, took two hours to fix it, predecessors of the work here is not to repeat, the problems they encountered to tidy up, the main reference to the following a few blog, in this express thanks! This blog post requires a reader with some basic knowledge of git.

1. "Software use" GitHub tutorial for Eclipse

2.Eclipse submits the code to GitHub

3. Egit Conflict resolution in Eclipse

The first two more specifically describes how to integrate egit in Eclipse, and the third solves the problem of egit conflict.

Here are a few main issues to note:

1, Eclipse upload github problem. Just after you've configured the steps, click Team->share Project to finish, and then click Team->commit to show the following:

　　　　

At this point the problem does not know what meaning, but the solution is as follows:

　　　　

Reference from: http://www.zhihu.com/question/43408545

2. Non-fast-forward Error solution in GitHub:

The behavior is: Commit succeeds, but the commit and push is unsuccessful, showing Non-fast-forward.

The reason: Git version conflict, that is, the local git repository and github above the Git repository is changed, if the mandatory commit will overwrite GitHub above. As a general practice, pull the top of GitHub to local, then merge, and push the results of the merge to GitHub.

Workaround: Select Team->synchronize Workspace; then it will appear as shown, click on the red box to perform the pull operation.

　　　　

Then in the merge operation. This is the main reference in the above Reference blog 3. Egit Conflict resolution in Eclipse

GitHub's problems with eclipse