克服心理障碍开始搞毕设!
实验结果是令人沮丧的(此处按下不表...),但是代码依然有存在的价值. 所以把它们同步到了github上,练习git的使用,虽然目前仍处于非常初级的熟悉阶段.
git官网上有windows平台下安装git程序的帮助教程.
解决了两个问题:
1. git bash的中文乱码问题
解决方案的传送门请戳这里
虽然在服务器端中文路径依然乱码...不过在bash中已经可以输入中文了.
2. git push操作的"non-fast-forward” errors
$ git push origin master
To ../remote/
! [rejected] master -> master (non-fast forward)
error: failed to push some refs to '../remote/'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes before pushing again. See the 'non-fast forward'
section of 'git push --help' for details.
出错信息如上图所示.
网上通行的'git pull'命令不管用,终端反问我: "You asked me to pull without telling me which branch you want to merge with..."
于是具体问题还是要具体解决.
git pull git@github.com:username/repo_name master