在服务器端...
$ git --version
git version 1.8.3.1
在客户端
λ git --version
git version 2.17.1.windows.2
我有一个存储在Windows上的git文件夹，其中包含新文件，这些文件将被上传。
我初始化了我的文件夹。
C:\Users\IT.Developer\MigrationProject
λ git init
Initialized empty Git repository in C:/Users/IT.Developer/MigrationProject/.git/
C:\Users\IT.Developer\MigrationProject (master -> origin)
λ ls -al
total 21
drwxr-xr-x 1 IT.Developer 1049089 0 Sep 13 08:58 ./
drwxr-xr-x 1 IT.Developer 1049089 0 Sep 13 08:57 ../
drwxr-xr-x 1 IT.Developer 1049089 0 Sep 13 08:58 .git/
-rw-r--r-- 1 IT.Developer 1049089 7 Sep 13 08:58 NewFile2BeCommitted.txt
> Blockquote
C:\Users\IT.Developer\MigrationProject (master -> origin)
我添加了文件（仅为示例目的而添加一个文件）！
λ git add .
C:\Users\IT.Developer\MigrationProject (master -> origin)
λ git status
On branch master
No commits yet
Changes to be committed:
(use "git rm --cached <file>..." to unstage)
new file: NewFile2BeCommitted.txt
C:\Users\IT.Developer\MigrationProject (master -> origin)
现在我要进行提交操作....
λ git commit -m "Upload 2, test"
[master (root-commit) cf6cb7f] Upload 2, test
Committer: Developer (Vertical Health Internal) <IT.Developer@INTERNAL.NET>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly. Run the
following command and follow the instructions in your editor to edit
your configuration file:
git config --global --edit
After doing this, you may fix the identity used for this commit with:
git commit --amend --reset-author
1 file changed, 1 insertion(+)
create mode 100644 NewFile2BeCommitted.txt
C:\Users\IT.Developer\MigrationProject (master -> origin)
我的下一步是将内容添加到远程服务器中...
λ git remote add origin git@192.168.5.200:/srv/git/project.git
C:\Users\IT.Developer\MigrationProject (master -> origin)
这是我的痛点...
λ git push origin master
Enter passphrase for key '/c/Users/IT.Developer/.ssh/id_rsa':
To 192.168.5.200:/srv/git/project.git
! [rejected] master -> master (fetch first)
error: failed to push some refs to 'git@192.168.5.200:/srv/git/project.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
C:\Users\IT.Developer\MigrationProject (master -> origin)
我正在尝试解决（跳跃）不一致性问题。
λ git stash
No local changes to save
C:\Users\IT.Developer\MigrationProject (master -> origin)
我正在尝试拉取
λ git pull
Enter passphrase for key '/c/Users/IT.Developer/.ssh/id_rsa':
warning: no common commits
remote: Counting objects: 3, done.
remote: Total 3 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
From 192.168.5.200:/srv/git/project
* [new branch] master -> origin/master
There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details.
git pull <remote> <branch>
If you wish to set tracking information for this branch you can do so with:
git branch --set-upstream-to=origin/<branch> master
C:\Users\IT.Developer\MigrationProject (master -> origin)
我再次尝试拉取
λ git pull origin master
Enter passphrase for key '/c/Users/IT.Developer/.ssh/id_rsa':
From 192.168.5.200:/srv/git/project
* branch master -> FETCH_HEAD
fatal: refusing to merge unrelated histories
C:\Users\IT.Developer\MigrationProject (master -> origin)
但是，我又做不到
怎么解决这个问题？