git clone http://github.com/lopentu/micro.learning
Three steps to upload your files:
- git add -A
- git commit -m 'comment'
- git pull
- git push
Fix conflict:
- Modify and remove the conflict marks in the conflicted file test.py
- git add .
- git commit
- git pull
- git push