Delete Git-GitHub-howto.bib~
Delete Git-GitHub-howto.tex~
Add the content of merge conflict
Merge branch 'master' of github.com:zhenglab/LaTeX_Git-GitHub-howto

# 请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支
# 合并到主题分支。
#
# 以 '#' 开头的行将被忽略，而且空提交说明将会终止提交。
Add content of merge conflict
Update the content of resetting historical version and add the content of modifying the submitted messages
Modify the content of view the record of a file
Modify minor errors