好麻烦啊 本地不进行commit就不能实现分支同步 不过也算是记录点保存吧
Merge branch 'master' of https://github.com/Sewens/HomeWork4CTC

Conflicts:
	Car.h
没搞懂这是要干啥 不过似乎跟着做就能同步了 git还真是难用啊
Conflicts:
	Car.h
这是啥
Merge branch 'master' of https://github.com/Sewens/HomeWork4CTC

Conflicts:
	Car.h
成了
Merge branch 'master' of https://github.com/Sewens/HomeWork4CTC

Conflicts:
	Car.h