1.本地创建一个本地仓库 2.关联远程端:git remote add origin git@github.com:用户名/远程库名.git3.同步远程仓库到本地git pull这个时候会报错If you wish to set tracking information for this branch you can do so with:git branch --set-upstream-to=origin/<branch> master再按提示执行git branch --set-upst…
在git项目下执行git difftool,出现如下报错 /Library/Developer/CommandLineTools/usr/libexec/git-core/mergetools/diffmerge: line : diffmerge: command not found 解决方法 ln -s /Applications/DiffMerge.app/Contents/Resources/diffmerge.sh /usr/local/bin/diffmerge…
0. git statusOn branch masterYour branch and 'origin/master' have diverged,and have 1 and 3 different commits each, respectively. (use "git pull" to merge the remote branch into yours) 这是分支产生了分叉现象(就是你的分支和服务器的对应分支有共同基点,然后向不同方向发展) 1. git pull 它包括…