Git的更新、提交、还原方法:https://blog.csdn.net/geng31/article/details/78585557 冲突解决:https://blog.csdn.net/collonn/article/details/52959436