[英]your branch and 'origin/master' have diverged
我的起源大师和本地大师分歧如下。 我想忽略 origin/master 中的更改,并能够将我的本地更改推送到 origin master。 我做了 git pull 然后是 git stash 并试图推动,但这没有帮助。 我不想创建一个新的提交并将原始主机的更改合并到我的本地主机上。
[~/Documents/projectRepo]$ git status *[master]
On branch master
Your branch and 'origin/master' have diverged,
and have 40 and 1 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
deleted by us: file1.json
deleted by us: file2.json
no changes added to commit (use "git add" and/or "git commit -a")
当我在不拉的情况下强制推动时,我得到了这个:
git push -f origin master
Total 0 (delta 0), reused 0 (delta 0)
remote: error: GH003: Sorry, force-pushing to master is not allowed.
To ssh://github.com/zack/projectRepo.git
! [remote rejected] master -> master (pre-receive hook declined)
error: failed to push some refs to 'ssh://github.com/zack/projectRepo.git'
git merge --abort
。git pull
git merge origin/master
git add <your_file_name>
git commit -m "Resolving conflicts"
git push
声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.