我正在学习Git。我创建了3个文件夹e:\temp\repo remote,e:\temp\repo local 1和e:\temp\repo local 2。我想做以下几件事:
在文件夹e:\temp\repo remote上
git init --bash在文件夹e:\temp\repo local 1上
git clone "e:\temp\repo remote" "e:\temp\repo local 1"在文件夹e:\temp\repo local 2上
git clone "e:\temp\repo remote" "e:\temp\repo local 2"将文件file1.txt复制到e:\temp\repo local 1\dir1文件夹。将文件file2.txt复制到e:\temp\repo local 2\dir2文件夹。
在文件夹e:\temp\repo local 1上
git add *
git commit -m "dir1\file1.txt created"
git push在文件夹e:\temp\repo local 2上
git add *
git commit -m "dir2\file2.txt created"当我想要将本地2存储库推送到远程存储库时,它会失败,并显示以下消息:
To E:\temp\repo remote
! [rejected] master -> master (fetch first)
error: failed to push some refs to 'E:\temp\repo remote'
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."我按照说明调用repo local 2中的pull:
$ git pull
warning: no common commits
remote: Counting objects: 4, done.
remote: Total 4 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (4/4), done.
From E:\temp\repo remote
* [new branch] master -> origin/master
fatal: refusing to merge unrelated histories或
$ git pull "e:\temp\repo remote"
From e:\temp\repo remote
* branch HEAD -> FETCH_HEAD
fatal: refusing to merge unrelated histories但是为什么会有不相关的历史呢?
我应该如何将第二个用户的更改合并到远程存储库?
https://stackoverflow.com/questions/41447481
复制相似问题