git is a distributed version control system. git is free software distributed under thr GPL git tracks changes of files git push sucessful!
#new branch creating a new branch is quick &&simple
#feature1 and simple
#冲突点
master:123
#冲突点 feature1:123 feature1
#dev 123