Git is a distributed version hehe control system.
Git is a free software 期待报错中 distributed under the GPL.
Git has a mutable index called stage.
Git tracks changes.你们是不是再搞笑
再尝试一下修改文件2222
<<<<<<< HEAD
我龙妈又回来了!!!我是master主分支的！！！！
=======
我龙妈又回来了!!!我是featuretwo分支的
>>>>>>> feature2