Initial Commit
first commit all files
.xcodeproj是什么玩意啊
a new branch rootBranch
nothing
chong fu tijiao
nothing
conflict
Merge branch 'master' of github.com:guoxuemei/UsingGit
merge commit
commit to push