The resolution of the conflict git github

1. create a txt file and edit

　　

 

 2. Then push to github, see the tutorial before the procedure.

　　

 

 3. In another folder pull (with a small pull turtle), respectively, in the original clone folders and folder operations test.txt.

　　

 

 　　

 

 4. The server pushes the body

　

 

5. Push, the following error occurs in the cloning

　　 

 

 6. click on pull, or quit with Hu little turtle pull, there will be the following, the icon becomes an exclamation mark

　　          

 7. Handling Conflict

　　

 

 　　

 

 8. Click resolve conflicts

　　       

 

 9. Now push github on it