A place of encounter do not understand, a project to put it somewhere else, and then use git, suggesting that is is not a reposity, use git init, to initialize a repository, pull the results when he is conflict, so I can only re-fork a bit, re-do, do not quite understand why there are so many conflicts,
git doubts
Guess you like
Origin blog.csdn.net/baibaichenchen/article/details/74998407
Recommended
Ranking