blocks|key|1410619|text|您可能在github上有从未合并过的更改。尝试使用git+pull来获取并合并更改，然后就可以进行推送了。如果我误解了你的问题，很抱歉。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1410620|entityMap^0|P|8|0^^$0|@$1|2|3|4|5|6|7|H|8|@$9|I|A|J|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|K|8|@]|D|@]|E|$]]]|G|$]]

You probably have changes on github that you never merged. Try <code>git pull</code> to fetch and merge the changes, then you should be able to push. Sorry if I misunderstood your question.

blocks|key|1195311|text|您还可以通过在分支名称前添加%2B符号来强制推送。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1195312|git+push+origin+%2Bsome_branch|code-block|syntax|javascript|1195313|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|I|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|J|8|@]|9|@]|A|$E|F]]|$1|G|3|-4|5|6|7|K|8|@]|9|@]|A|$]]]|H|$]]

You can also force a push by adding the + symbol before your branch name.

<pre><code>git push origin +some_branch
</code></pre>

blocks|key|1195347|text|如果您"git+pull“显示”已更新“，但仍然收到此错误，则可能是因为您的其他分支中有一个不是最新的。尝试切换到另一个分支并确保其中一个分支也是最新的，然后再尝试"git推送“：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1195348|切换到分支"foo“并更新它：|1195349|$+git+checkout+foo
$+git+pull|code-block|syntax|javascript|1195350|您可以通过发出以下命令来查看所获得的分支：|1195351|$+git+branch|1195352|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|$]]

If you "git pull" and it says "Already up-to-date.", and still get this error, it might be because one of your other branches isn't up to date. Try switching to another branch and making sure that one is also up-to-date before trying to "git push" again:

Switch to branch "foo" and update it:

<pre><code>$ git checkout foo
$ git pull
</code></pre>

You can see the branches you've got by issuing command:

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

blocks|key|1410751|text|当你有冲突的标签时，也会发生这个问题。如果您本地版本和远程版本对不同的提交使用相同的标记名，那么您可能会在这里结束。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1410752|你可以通过删除本地标签来解决这个问题：|1410753|$+git+tag+--delete+foo_tag|code-block|syntax|javascript|1410754|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|K|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|L|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|M|8|@]|9|@]|A|$G|H]]|$1|I|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|J|$]]

This problem can also occur when you have conflicting tags. If your local version and remote version use same tag name for different commits, you can end up here.

You can solve it my deleting the local tag:

<pre><code>$ git tag --delete foo_tag
</code></pre>

blocks|key|1195434|text|当我收到这个错误时，我备份了我的整个项目文件夹。然后我做了类似这样的事情|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1195435|$+git+config+branch.master.remote+origin
$+git+config+branch.master.merge+refs/heads/master|code-block|syntax|javascript|1195436|在分支名称上使用...depending+(如果它不是主分支名称)。|1195437|然后我做了git+pull+--rebase。在那之后，我用我备份的项目的文件替换了拉出的文件。现在我准备再次提交我的更改并推送。|offset|length|style|CODE|1195438|entityMap^0|0|0|0|5|H|0^^$0|@$1|2|3|4|5|6|7|Q|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|R|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|S|8|@]|9|@]|A|$]]|$1|I|3|J|5|6|7|T|8|@$K|U|L|V|M|N]]|9|@]|A|$]]|$1|O|3|-4|5|6|7|W|8|@]|9|@]|A|$]]]|P|$]]

When I got this error, I backed up my entire project folder. Then I did something like

<pre><code>$ git config branch.master.remote origin
$ git config branch.master.merge refs/heads/master
</code></pre>

...depending on your branch name (if it's not master).

Then I did <code>git pull --rebase</code>. After that, I replaced the pulled files with my backed-up project's files. Now I am ready to commit my changes again and push.

blocks|key|1195480|text|您可以强制它推送，但请仅当您非常确定自己在做什么时才这么做。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1195481|该命令为：|1195482|git+push+-f+|code-block|syntax|javascript|1195483|entityMap^0|0|0|0^^$0|@$1|2|3|4|5|6|7|K|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|L|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|M|8|@]|9|@]|A|$G|H]]|$1|I|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|J|$]]

You can force it to push, but please do this ONLY when you're quite sure what you are doing.

The command is:

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

I'm getting following error, whn trying first Github push:

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

how can I fix this and merge remote changes?

How to merge remote changes at GitHub?

当我第一次尝试Github推送时，我得到了以下错误：[rejected] master -> master (non-fast forward)error: failed to push some refs to 'git@github.com:me/me.git'To prevent you from losing ...

问如何在GitHub中合并远程更改？
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何在GitHub中合并远程更改？EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何在GitHub中合并远程更改？
EN