/learngit

Git is a distributed version control system.
Git is free software distributed under the GPL.
Git test
create a new branch
<<<<<<< HEAD
hahaha 
=======
feature1 
>>>>>>> feature1
merge merge