git推拒绝 [英] git push rejected
问题描述
每当我尝试推动时，我都会变得愚蠢：
！ [被拒绝] master - > master（非快速转发）
错误：无法将某些文件推送到'git@github.com：companyX / projectX.git'
我们的团队有一个新的git设置。现在，我没有建立私人分支，而是分叉了我们的主存储库（在github上）来创建我自己的副本。
在某些时候，我所做的是：
$ git fetch upstream master：upstreammaster
所以这里是我目前的设置::
$ git branch
master
* upstreammaster
$ git remote -v
origin git@github.com：userX / projectX.git
git@github.com：companyX / projectX.git
其中userX是我的私有存储库。
对我的upstreammaster分支进行一些更改，并从上游主控中对PULL进行更改。
一切合并和东西：
$ git pull upstream master
remote：计数对象：95，done 。
remote：压缩对象：100％（60/60），完成。
remote：合计60（增量54），重用0（增量0）
开箱对象：100％（60/60），完成。
来自git@github.com：companyX / projectX
*分支大师 - > FETCH_HEAD
通过递归进行合并。
的东西| 165 ++++++++++++ --------
stuff | 35 ++ -
stuff | 107 ++++++++++ ---
东西| 105 ++++++++++ ---
东西| 24 ++ -
stuff | 9 + -
stuff | 53 +++ ----
stuff | 44 +++ ---
stuff | 52 +++ ----
stuff | 32 + ----
stuff | 4 + -
stuff | 138 ++++++++ ---------
stuff | 58 ++++ ----
stuff | 115 ++++++++ ------
的东西| 5 + -
stuff | 39 ++ ---
stuff | 28 ++ -
17个文件已更改，560个插入（+），453个删除（ - ）
然后当我尝试做时：
$ git push upstream master
到git@github.com ：companyX / projectX.git
！ [被拒绝] master - > master（非快速转发）
错误：无法将某些文件推送到'git@github.com：companyX / projectX.git'
任何帮助将非常感谢！如果您需要澄清，请询问我会回复！ 解决方案
执行推送时，请尝试指定上游主服务器的refspec：
git push upstream upstreammaster：master
I give up! Whenever I try to push I get a stupid:
! [rejected] master -> master (non-fast forward)
error: failed to push some refs to 'git@github.com:companyX/projectX.git'
Our team has a new git setup. Instead of making private branches I now Forked our main repository (on github) to create my own copy.
At some point what I did was:
$ git fetch upstream master:upstreammaster
So here is my current setup::
$ git branch
master
* upstreammaster
$ git remote -v
origin git@github.com:userX/projectX.git
upstream git@github.com:companyX/projectX.git
where userX is my private repository.
So I go and make some changes to my upstreammaster branch, and the PULL from "upstream master". Everything merges and stuff:
$ git pull upstream master
remote: Counting objects: 95, done.
remote: Compressing objects: 100% (60/60), done.
remote: Total 60 (delta 54), reused 0 (delta 0)
Unpacking objects: 100% (60/60), done.
From git@github.com:companyX/projectX
* branch master -> FETCH_HEAD
Merge made by recursive.
stuff | 165 ++++++++++++--------
stuff | 35 ++--
stuff | 107 ++++++++++---
stuff | 105 ++++++++++---
stuff | 24 ++--
stuff | 9 +-
stuff | 53 +++----
stuff | 44 +++---
stuff | 52 +++----
stuff | 32 +----
stuff | 4 +-
stuff | 138 ++++++++---------
stuff | 58 ++++----
stuff | 115 ++++++++------
stuff | 5 +-
stuff | 39 ++---
stuff | 28 ++--
17 files changed, 560 insertions(+), 453 deletions(-)
but then when I try to do:
$ git push upstream master
To git@github.com:companyX/projectX.git
! [rejected] master -> master (non-fast forward)
error: failed to push some refs to 'git@github.com:companyX/projectX.git'
Any help would be greately appreciated! If you need clarification please ask, I will reply!
When doing a push, try specifying the refspec for the upstream master:
git push upstream upstreammaster:master
这篇关于git推拒绝的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！
