Note For Git（Updating）

发现一个book

参考链接：http://gitbook.liuhui998.com/index.html

fatal: refusing to merge unrelated histories

git pull --rebase origin master

参考链接：https://blog.csdn.net/u014103733/article/details/79190717

First, rewinding head to replay your work on top of it...

参考链接：https://stackoverflow.com/questions/22320058/git-first-rewinding-head-to-replay

git fetch origin; git reset --hard origin/<branch>

Mac常用忽略文件配置

/[Ll]ibrary/

/[Tt]emp/

.consulo/

*.csproj

*.unityproj

*.sln

*.suo

*.tmp

*.user

*.userprefs

*.pidb

*.booproj

*.svd