This repository was generated with GitHub Contributions generator. Thanks, @IonicaBizau.
>>git remote add origin https://github.com/0532/HT-Contributions.git
>>git fetch origin master
>>git merge origin/master
>>git push -u origin master
合并冲突错误:
CONFLICT (add/add): Merge conflict in README.md
Automatic merge failed; fix conflicts and then commit the result.
>>git remote add origin https://github.com/0532/HT-Contributions.git
>>git fetch origin master
>>git add .
>>git commit -m 'message'
>>git merge origin/master
>>git push -u origin master
origin/master origin/master origin/master origin/master