blocks|key|295619|text|正如错误消息所说:在尝试git+push之前先执行git+pull。显然，您的本地分支与您的跟踪分支不同步。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|295620|根据项目规则和您的工作流程，您可能还希望使用git+pull+--rebase。|295621|entityMap^0|C|8|P|8|0|M|H|0^^$0|@$1|2|3|4|5|6|7|J|8|@$9|K|A|L|B|C]|$9|M|A|N|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|O|8|@$9|P|A|Q|B|C]]|D|@]|E|$]]|$1|H|3|-4|5|6|7|R|8|@]|D|@]|E|$]]]|I|$]]

As the error message says: <code>git pull</code> before you try to <code>git push</code>. Apparently your local branch is out of sync with your tracking branch.

Depending on project rules and your workflow you might also want to use <code>git pull --rebase</code>.

blocks|key|295821|text|我刚刚收到这个错误。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|295822|在创建本地git存储库之后，我创建了一个github存储库，因此在推送到github之前，我需要将更改接受到本地。在这种情况下，唯一的更改是在创建github存储库时作为可选步骤创建的自述文件。|295823|git+pull+https://github.com/*username*/*repository*.git+master|code-block|syntax|javascript|295824|仓库URL位于github项目页面：|295825|​|295826|📷|atomic|offset|length|295827|295828|然后我重新初始化(这可能不需要)|295829|git+init
git+add+.
git+commit+-m+"update"|295830|然后推送：|295831|git+push|295832|entityMap|0|IMAGE|mutability|IMMUTABLE|imageUrl|https://ask.qcloudimg.com/http-save/yehe-900000/cc1e2dc27b4e94d25a5af9759bbb5719.jpeg|imageAlt^0|0|0|0|0|0|0|1|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|19|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|1A|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|1B|8|@]|9|@]|A|$G|H]]|$1|I|3|J|5|6|7|1C|8|@]|9|@]|A|$]]|$1|K|3|L|5|6|7|1D|8|@]|9|@]|A|$]]|$1|M|3|N|5|O|7|1E|8|@]|9|@$P|1F|Q|1G|1|1H]]|A|$]]|$1|R|3|L|5|6|7|1I|8|@]|9|@]|A|$]]|$1|S|3|T|5|6|7|1J|8|@]|9|@]|A|$]]|$1|U|3|V|5|F|7|1K|8|@]|9|@]|A|$G|H]]|$1|W|3|X|5|6|7|1L|8|@]|9|@]|A|$]]|$1|Y|3|Z|5|F|7|1M|8|@]|9|@]|A|$G|H]]|$1|10|3|-4|5|6|7|1N|8|@]|9|@]|A|$]]]|11|$12|$5|13|14|15|A|$16|17|18|-4]]]]

I've just received this error.

I created a github repository after creating my local git repository so I needed to accept the changes into local before pushing to github. In this case the only change was the readme file created as optional step when creating github repository.

<pre><code>git pull https://github.com/*username*/*repository*.git master
</code></pre>

repository URL is got from here on project github page : 

<img src="https://i.stack.imgur.com/V3YGD.jpg" alt="enter image description here">

I then re-initialised (this may not be needed)

<pre><code>git init
git add .
git commit -m "update"
</code></pre>

Then push : 

<pre><code>git push
</code></pre>

blocks|key|296190|text|使用以下命令：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|296191|git+pull+--allow-unrelated-histories+<nick+name+of+repository>+<branch+name>|offset|length|style|CODE|296192|像这样：|296193|git+pull+--allow-unrelated-histories+origin+master|296194|当项目没有任何公共祖先时，就会发生此错误。|296195|entityMap^0|0|0|24|0|0|0|1E|0|0^^$0|@$1|2|3|4|5|6|7|P|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|Q|8|@$D|R|E|S|F|G]]|9|@]|A|$]]|$1|H|3|I|5|6|7|T|8|@]|9|@]|A|$]]|$1|J|3|K|5|6|7|U|8|@$D|V|E|W|F|G]]|9|@]|A|$]]|$1|L|3|M|5|6|7|X|8|@]|9|@]|A|$]]|$1|N|3|-4|5|6|7|Y|8|@]|9|@]|A|$]]]|O|$]]

use this command:

<code>git pull --allow-unrelated-histories &lt;nick name of repository&gt; &lt;branch name&gt;</code>

like:

<code>git pull --allow-unrelated-histories origin master</code>

this error occurs when projects don't have any common ancestor.

blocks|key|512322|text|如果git+pull没有帮助，那么您可能已经推送了您的更改(A)，然后使用git+commit+--amend添加了更多更改(B)。因此，git认为您可以丢失历史记录-它将B解释为不同的提交，尽管它包含来自A的所有更改。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|512323|+++++++++++++B
++++++++++++/
++++++++---X---A|code-block|syntax|javascript|512324|如果在A之后没有人更改存储库，那么您可以执行git+push+--force。|512325|但是，如果其他人在A之后发生了更改：|512326|+++++++++++++B
++++++++++++/
++++++++---X---A---C|512327|然后，您必须将人员从A更改为B+(C->D)。|512328|+++++++++++++B---D
++++++++++++/
++++++++---X---A---C|512329|或者手动修复问题。我还没想过该怎么做。|512330|entityMap^0|2|8|11|I|0|0|3|1|M|G|0|9|1|0|0|A|1|E|1|H|1|K|1|0|0|0^^$0|@$1|2|3|4|5|6|7|Y|8|@$9|Z|A|10|B|C]|$9|11|A|12|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|13|8|@]|D|@]|E|$I|J]]|$1|K|3|L|5|6|7|14|8|@$9|15|A|16|B|C]|$9|17|A|18|B|C]]|D|@]|E|$]]|$1|M|3|N|5|6|7|19|8|@$9|1A|A|1B|B|C]]|D|@]|E|$]]|$1|O|3|P|5|H|7|1C|8|@]|D|@]|E|$I|J]]|$1|Q|3|R|5|6|7|1D|8|@$9|1E|A|1F|B|C]|$9|1G|A|1H|B|C]|$9|1I|A|1J|B|C]|$9|1K|A|1L|B|C]]|D|@]|E|$]]|$1|S|3|T|5|H|7|1M|8|@]|D|@]|E|$I|J]]|$1|U|3|V|5|6|7|1N|8|@]|D|@]|E|$]]|$1|W|3|-4|5|6|7|1O|8|@]|D|@]|E|$]]]|X|$]]

If <code>git pull</code> does not help, then probably you have pushed your changes (A) and after that had used <code>git commit --amend</code> to add some more changes (B). Therefore, git thinks that you can lose the history - it interprets B as a different commit despite it contains all changes from A.

<pre><code> B
 /
 ---X---A
</code></pre>

If nobody changes the repo after <code>A</code>, then you can do <code>git push --force</code>.

However, if there are changes after <code>A</code> from other person:

<pre><code> B
 /
 ---X---A---C
</code></pre>

then you must rebase that persons changes from <code>A</code> to <code>B</code> (<code>C</code>-><code>D</code>).

<pre><code> B---D
 /
 ---X---A---C
</code></pre>

or fix the problem manually. I didn't think how to do that yet.

blocks|key|296255|text|这是因为您在master中做了一些更改，因此项目要求您先拉。如果你想推送它，你可以通过输入下面的命令来使用暴力：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|296256|git+push+-f+origin+master|code-block|syntax|javascript|296257|记住首先提交您的更改：|296258|git+add+.
git+commit+-m+"Your+commit+message"|296259|entityMap^0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|M|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|N|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|O|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|P|8|@]|9|@]|A|$E|F]]|$1|K|3|-4|5|6|7|Q|8|@]|9|@]|A|$]]]|L|$]]

This is because you did some changes in your master so the project ask you to pull first. If you want to push it anyway you can use brute force by typing this:

<pre><code>git push -f origin master
</code></pre>

Remember to first commit your changes:

<pre><code>git add .
git commit -m "Your commit message"
</code></pre>

blocks|key|295859|text|试试这个命令："git拉取源站“|type|unstyled|depth|inlineStyleRanges|entityRanges|data|295860|这对我很管用。|295861|请查看此链接：https://help.github.com/articles/dealing-with-non-fast-forward-errors|offset|length|295862|entityMap|0|LINK|mutability|MUTABLE|url|https://help.github.com/articles/dealing-with-non-fast-forward-errors^0|0|0|7|1X|0|0^^$0|@$1|2|3|4|5|6|7|P|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|Q|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|R|8|@]|9|@$F|S|G|T|1|U]]|A|$]]|$1|H|3|-4|5|6|7|V|8|@]|9|@]|A|$]]]|I|$J|$5|K|L|M|A|$N|O]]]]

Try this command: "git pull origin master"

It worked for me.

Check this link: <a href="https://help.github.com/articles/dealing-with-non-fast-forward-errors" rel="noreferrer">https://help.github.com/articles/dealing-with-non-fast-forward-errors</a>

blocks|key|512115|text|你需要做的是|type|unstyled|depth|inlineStyleRanges|entityRanges|data|512116|git+branch|code-block|syntax|javascript|512117|如果输出类似于：|512118|*+(no+branch)
master|512119|那就这么做|512120|git+checkout+master|512121|请确保您没有任何挂起的提交，因为签出将丢失所有未提交的更改。|512122|entityMap^0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|S|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|T|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|U|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|V|8|@]|9|@]|A|$E|F]]|$1|K|3|L|5|6|7|W|8|@]|9|@]|A|$]]|$1|M|3|N|5|D|7|X|8|@]|9|@]|A|$E|F]]|$1|O|3|P|5|6|7|Y|8|@]|9|@]|A|$]]|$1|Q|3|-4|5|6|7|Z|8|@]|9|@]|A|$]]]|R|$]]

You need to do 

<pre><code>git branch
</code></pre>

if the output is something like:

<pre><code>* (no branch)
master
</code></pre>

then do

<pre><code>git checkout master
</code></pre>

Make sure you do not have any pending commits as checking out will lose all non-committed changes.

blocks|key|512514|text|这发生在我使用开发分支的时候，我的主分支没有最新的更新。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|512515|因此，当我尝试从开发分支进行git推送时，我遇到了这个错误。|512516|我通过切换到主分支，git+pull，然后返回到开发分支和git推送来修复它。|512517|$+git+fetch+&&+git+checkout+master
$+git+pull
$+git+fetch+&&+git+checkout+develop
$+git+push|code-block|syntax|javascript|512518|entityMap^0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|M|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|N|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|O|8|@]|9|@]|A|$]]|$1|F|3|G|5|H|7|P|8|@]|9|@]|A|$I|J]]|$1|K|3|-4|5|6|7|Q|8|@]|9|@]|A|$]]]|L|$]]

This happened to me when I was on develop branch and my master branch is not with latest update.

So when I tried to git push from develop branch I had that error.

I fixed it by switching to master branch, git pull, then go back to develop branch and git push.

<pre><code>$ git fetch &amp;&amp; git checkout master
$ git pull
$ git fetch &amp;&amp; git checkout develop
$ git push
</code></pre>

blocks|key|295969|text|我在开发机器上遇到了这个问题。dev分支推送得很好，但master分支给了我(在dev分支上使用git+push时)：|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|295970|!+[rejected]++++++++master+->+master+(non-fast-forward)|code-block|syntax|javascript|295971|所以我试着：|295972|git+checkout+master
git+pull|295973|这给了我：|295974|You+asked+me+to+pull+without+telling+me+which+branch+you
want+to+merge+with,+and+'branch.master.merge'+in
your+configuration+file+does+not+tell+me,+either.|295975|我发现.git/config中缺少主分支，并添加了：|295976|[branch+"master"]
++++remote+=+origin
++++merge+=+refs/heads/master|295977|之后，git+push在dev分支上也工作得很好。|295978|entityMap^0|F|3|R|6|14|3|1C|8|0|0|0|0|0|0|3|B|0|0|3|8|C|3|0^^$0|@$1|2|3|4|5|6|7|10|8|@$9|11|A|12|B|C]|$9|13|A|14|B|C]|$9|15|A|16|B|C]|$9|17|A|18|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|19|8|@]|D|@]|E|$I|J]]|$1|K|3|L|5|6|7|1A|8|@]|D|@]|E|$]]|$1|M|3|N|5|H|7|1B|8|@]|D|@]|E|$I|J]]|$1|O|3|P|5|6|7|1C|8|@]|D|@]|E|$]]|$1|Q|3|R|5|H|7|1D|8|@]|D|@]|E|$I|J]]|$1|S|3|T|5|6|7|1E|8|@$9|1F|A|1G|B|C]]|D|@]|E|$]]|$1|U|3|V|5|H|7|1H|8|@]|D|@]|E|$I|J]]|$1|W|3|X|5|6|7|1I|8|@$9|1J|A|1K|B|C]|$9|1L|A|1M|B|C]]|D|@]|E|$]]|$1|Y|3|-4|5|6|7|1N|8|@]|D|@]|E|$]]]|Z|$]]

I had this problem on a development machine. The <code>dev</code> branch was pushing fine but the
the <code>master</code> branch gave me (while <code>git push</code>ing when being on the <code>dev</code> branch):

<pre><code>! [rejected] master -&gt; master (non-fast-forward)
</code></pre>

So I tried:

<pre><code>git checkout master
git pull
</code></pre>

Which gave me:

<pre><code>You asked me to pull without telling me which branch you
want to merge with, and 'branch.master.merge' in
your configuration file does not tell me, either.
</code></pre>

I found out the master branch was missing from <code>.git/config</code> and added:

<pre><code>[branch "master"]
 remote = origin
 merge = refs/heads/master
</code></pre>

Afterwards <code>git push</code> also worked fine on the <code>dev</code> branch.

blocks|key|296018|text|我也有同样的问题。我使用Git+Totoise。只需右键单击->TotoiseGit+->+Clean。现在你可以推送到Github，它在我身上运行得很好:D|type|unstyled|depth|inlineStyleRanges|entityRanges|data|296019|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

I had same as issue.
I use Git Totoise.
Just Right Click ->TotoiseGit -> Clean Up .
Now you can push to Github
It worked fine with me :D

blocks|key|512472|text|这是因为您对其主文件进行了冲突的更改。而您的存储库服务器无法通过这些文字告诉您，因此它会产生此错误，因为这不是他为您处理这些冲突的问题，所以他要求您自己处理这些冲突。是什么？|type|unstyled|depth|inlineStyleRanges|entityRanges|data|512473|1-+git+pull这会将你的代码从你的仓库合并到你的站点管理员的代码中。所以冲突就显示出来了。|offset|length|style|CODE|512474|2-处理这些手动冲突。|512475|3-|512476|git+push+origin+master|code-block|syntax|javascript|512477|现在，你的问题已经解决了。|512478|entityMap^0|0|3|8|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|U|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|V|8|@$D|W|E|X|F|G]]|9|@]|A|$]]|$1|H|3|I|5|6|7|Y|8|@]|9|@]|A|$]]|$1|J|3|K|5|6|7|Z|8|@]|9|@]|A|$]]|$1|L|3|M|5|N|7|10|8|@]|9|@]|A|$O|P]]|$1|Q|3|R|5|6|7|11|8|@]|9|@]|A|$]]|$1|S|3|-4|5|6|7|12|8|@]|9|@]|A|$]]]|T|$]]

This is because you have made conflicting changes to its master. And your repository server is not able to tell you that with these words, so it gives this error because it is not a matter of him deal with these conflicts for you, so he asks you to do it by itself. As ?

1- <code>git pull</code>
This will merge your code from your repository to your code of your site master.
So conflicts are shown.

2- treat these manualemente conflicts.

3- 

<pre><code>git push origin master
</code></pre>

And presto, your problem has been resolved.

blocks|key|296408|text|这也可能是由于为Repo命名时导致的一些名称错误造成的。如果上面的任何一个答案都不起作用，.This对我来说是有效的：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|296409|删除该存储库并创建一个新存储库，然后重试以下命令：|296410|cd+'Local+Directory+Path'
git+remote+add+origin+*your_git_name.git*
git+push+-u+origin+master|code-block|syntax|javascript|296411|如果add+origin已经存在，请使用以下命令：|296412|git+remote+set-url+origin+*your_git_name.git*|296413|entityMap^0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|O|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|P|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|Q|8|@]|9|@]|A|$G|H]]|$1|I|3|J|5|6|7|R|8|@]|9|@]|A|$]]|$1|K|3|L|5|F|7|S|8|@]|9|@]|A|$G|H]]|$1|M|3|-4|5|6|7|T|8|@]|9|@]|A|$]]]|N|$]]

This may also be caused due to some name error caused while giving name to the Repo.
If any of the above answers haven't worked .This worked for me:

Delete that repo and create a new one and try the following commands again:

<pre><code>cd 'Local Directory Path'
git remote add origin *your_git_name.git*
git push -u origin master
</code></pre>

if add origin shows already exists use this instead:

<pre><code>git remote set-url origin *your_git_name.git*
</code></pre>

blocks|key|512084|text|我能够解决这个问题的唯一方法是删除本地和git代码库，并在两端重新创建相同的代码库。就目前而言，一切正常。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|512085|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

The only i was able to resolve this issue was to delete the local and git repo and create the same again at both ends. Works fine for now.

blocks|key|296322|text|如果任何人在尝试推送heroku时遇到此错误，只需将'origin‘替换为'+heroku’，如下所示:+git+push+-f+heroku+master|type|unstyled|depth|inlineStyleRanges|entityRanges|data|296323|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

If anyone has this error while trying to push to heroku then just replace 'origin' with 'heroku'
like this:
git push -f heroku master

blocks|key|512856|text|我也得到了同样的错误，但我很容易地解决了它，通过获取它的URL|type|unstyled|depth|inlineStyleRanges|entityRanges|data|512857|git+fetch+origin+Your+repository+origin|code-block|syntax|javascript|512858|然后简单地应用命令|512859|git+push+-f+origin+master|512860|你会得到一个好的结果|512861|entityMap^0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|O|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|P|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|Q|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|R|8|@]|9|@]|A|$E|F]]|$1|K|3|L|5|6|7|S|8|@]|9|@]|A|$]]|$1|M|3|-4|5|6|7|T|8|@]|9|@]|A|$]]]|N|$]]

I also got the same error but I solved it easily by fetching its URLs
as
<pre><code>git fetch origin Your repository origin
</code></pre>
then simply applying the command
<pre><code>git push -f origin master
</code></pre>
You will get a good result

I'm trying to push my project (all files in a new repository). I follow the steps but when I push with <code>git push -u origin master</code> I get this error:

<pre><code>! [rejected] master -&gt; master (non-fast-forward)
error: failed to push some refs to 'git@github.com:asantoya/projectnewbies.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again. See the
'Note about fast-forwards' section of 'git push --help' for details.
</code></pre>

I got this error many times and can't figure out what to do.

rejected master -> master (non-fast-forward)

服务器

我正在尝试推送我的项目(新存储库中的所有文件)。我遵循了这些步骤，但是当我使用git push -u origin master推送时，我得到了这个错误：! [rejected]        master -> master (non-fast-forward)error: failed to push some refs to 'git@github.com:asantoya/projectn

问被拒绝的主->主(非快进)
EN

回答 15

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问被拒绝的主->主(非快进)EN

回答 15

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问被拒绝的主->主(非快进)
EN