1 git add
2 git commit
3 git Pull (conflicts) divided into auto merge and manual merge
4 files that handle conflicts
5 git push this commit
I use the Eclipse plug-in egit, all operations directly in the ECLISPE can be completed, haha, I am more lazy, the official online teaching those git clone what kind of advanced operation I will not, feel egit or relatively useful, So the internet search for a detailed operation of the egit of the post, and now moved to share with you. The address I found for this post is: http://blog.csdn.net/luckarecs/article/details/7427605. Although this post is also written reproduced, I did not find the most original source, (PS: Some feedback that the original source is this: http://blog.csdn.net/laizhenhai88/article/details/7234974, I'm not sure, But still put this link up, thank @ter feedback), but if you reprint, still want to add this link, this also is to protect intellectual property right, haha, good, crap not much said, the following is the detailed content:
The address I found for this post is: http://blog.csdn.net/luckarecs/article/details/7427605.
PS: Someone feedback says the original source is this: http://blog.csdn.net/laizhenhai88/article/details/7234974,
Finally add a forum address: http://www.eoeandroid.com/thread-273360-1-1.html
Go Egit user manual for Git plugin on eclipse