blocks|key|2788659|text|如果您使用README和/或LICENSE文件初始化了新的github存储库，则会发生这种情况|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|2788660|git+remote+add+origin+[//your+github+url]

//pull+those+changes

git+pull+origin+master+

//+or+optionally,+'git+pull+origin+master+--allow-unrelated-histories'+if+you+have+initialized+repo+in+github+and+also+committed+locally

//now,+push+your+work+to+your+new+repo

git+push+origin+master|code-block|syntax|javascript|2788661|现在，您可以将存储库推送到github。基本上，您必须将这些新的初始化文件与您的工作合并。git+pull会为您进行获取和合并。如果您愿意，您也可以获取和合并。|2788662|entityMap^0|5|6|E|7|0|0|19|8|0^^$0|@$1|2|3|4|5|6|7|O|8|@$9|P|A|Q|B|C]|$9|R|A|S|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|T|8|@]|D|@]|E|$I|J]]|$1|K|3|L|5|6|7|U|8|@$9|V|A|W|B|C]]|D|@]|E|$]]|$1|M|3|-4|5|6|7|X|8|@]|D|@]|E|$]]]|N|$]]

This happens if you initialized a new github repo with <code>README</code> and/or <code>LICENSE</code> file

<pre><code>git remote add origin [//your github url]

//pull those changes

git pull origin master 

// or optionally, 'git pull origin master --allow-unrelated-histories' if you have initialized repo in github and also committed locally

//now, push your work to your new repo

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

Now you will be able to push your repository to github. Basically, you have to merge those new initialized files with your work. <code>git pull</code> fetches and merges for you. You can also fetch and merge if that suits you.

blocks|key|178507|text|该错误可能是由于您正在提交的代码和GitHub上的代码结构不同而导致的。它会产生冲突，可以通过以下方式解决|type|unstyled|depth|inlineStyleRanges|entityRanges|data|178508|git+pull|code-block|syntax|javascript|178509|合并冲突解决：|178510|git+push|178511|如果你确认你的新代码没有问题，你可以使用：|178512|git+push+-f+origin+master|178513|其中-f代表“强制提交”。|offset|length|style|CODE|178514|entityMap^0|0|0|0|0|0|0|2|2|0^^$0|@$1|2|3|4|5|6|7|W|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|X|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|Y|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|Z|8|@]|9|@]|A|$E|F]]|$1|K|3|L|5|6|7|10|8|@]|9|@]|A|$]]|$1|M|3|N|5|D|7|11|8|@]|9|@]|A|$E|F]]|$1|O|3|P|5|6|7|12|8|@$Q|13|R|14|S|T]]|9|@]|A|$]]|$1|U|3|-4|5|6|7|15|8|@]|9|@]|A|$]]]|V|$]]

The error possibly comes because of the different structure of the code that you are committing and that present on GitHub. It creates conflicts which can be solved by 

<pre><code>git pull
</code></pre>

Merge conflicts resolving:

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

If you confirm that your new code is all fine you can use:

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

Where <code>-f</code> stands for "force commit".

blocks|key|3001027|text|如果这是你第一次推送|type|unstyled|depth|inlineStyleRanges|entityRanges|data|3001028|只需更改|3001029|git+push+<repo+name>+master|code-block|syntax|javascript|3001030|把它改成这样！|3001031|git+push+-f+<repo+name>+master|3001032|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 this is your first push

just change the 

<pre><code>git push &lt;repo name&gt; master
</code></pre>

change it like this!

<pre><code>git push -f &lt;repo name&gt; master
</code></pre>

blocks|key|179304|text|提供的答案对我不起作用。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|179305|我在GitHub上有一个空的存储库，只有一个许可证文件和一个本地提交。起作用的是：|179306|$+git+fetch
$+git+merge+--allow-unrelated-histories
Merge+made+by+the+'recursive'+strategy.
+LICENSE+%7C+21+%2B%2B%2B%2B%2B%2B%2B%2B%2B%2B%2B%2B%2B%2B%2B%2B%2B%2B%2B%2B%2B
+1+file+changed,+21+insertions(%2B)
+create+mode+100644+LICENSE|code-block|syntax|javascript|179307|另外，在使用merge之前，您可能需要：|offset|length|style|CODE|179308|$+git+branch+--set-upstream-to+origin/master
Branch+'master'+set+up+to+track+remote+branch+'master'+from+'origin'.|179309|entityMap^0|0|0|0|6|5|0|0^^$0|@$1|2|3|4|5|6|7|S|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|T|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|U|8|@]|9|@]|A|$G|H]]|$1|I|3|J|5|6|7|V|8|@$K|W|L|X|M|N]]|9|@]|A|$]]|$1|O|3|P|5|F|7|Y|8|@]|9|@]|A|$G|H]]|$1|Q|3|-4|5|6|7|Z|8|@]|9|@]|A|$]]]|R|$]]

The supplied answers didn't work for me. 

I had an empty repo on GitHub with only the LICENSE file and a single commit locally. What worked was:

<pre class="lang-sh prettyprint-override"><code>$ git fetch
$ git merge --allow-unrelated-histories
Merge made by the 'recursive' strategy.
 LICENSE | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 LICENSE
</code></pre>

Also before <code>merge</code> you may want to:

<pre class="lang-sh prettyprint-override"><code>$ git branch --set-upstream-to origin/master
Branch 'master' set up to track remote branch 'master' from 'origin'.
</code></pre>

blocks|key|181219|text|您可以参考:如何处理"refusing+to+merge+unrelated+histories“错误：|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|181220|$+git+pull+--allow-unrelated-histories
$+git+push+-f+origin+master|code-block|syntax|javascript|181221|entityMap|0|LINK|mutability|MUTABLE|url|https://github.community/t5/How-to-use-Git-and-GitHub/How-to-deal-with-quot-refusing-to-merge-unrelated-histories-quot/m-p/16305#M5000^0|B|11|0|0|0^^$0|@$1|2|3|4|5|6|7|Q|8|@]|9|@$A|R|B|S|1|T]]|C|$]]|$1|D|3|E|5|F|7|U|8|@]|9|@]|C|$G|H]]|$1|I|3|-4|5|6|7|V|8|@]|9|@]|C|$]]]|J|$K|$5|L|M|N|C|$O|P]]]]

You may refer to: How to deal with &quot;<a href="https://github.community/t5/How-to-use-Git-and-GitHub/How-to-deal-with-quot-refusing-to-merge-unrelated-histories-quot/m-p/16305#M5000" rel="noreferrer">refusing to merge unrelated histories</a>&quot; error:
<pre><code>$ git pull --allow-unrelated-histories
$ git push -f origin master
</code></pre>

blocks|key|181223|text|我遵循了以下步骤：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|181224|拉动主机：|181225|git+pull+origin+master|code-block|syntax|javascript|181226|这将使您的本地存储库与Github存储库同步。添加新文件，然后：|181227|git+add+.|181228|提交更改：|181229|git+commit+-m+"adding+new+file++Xyz"|181230|最后，推送源主：|181231|git+push+origin+master|181232|刷新您的Github存储库，您将看到新添加的文件。|181233|entityMap^0|0|0|0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|Y|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|Z|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|10|8|@]|9|@]|A|$G|H]]|$1|I|3|J|5|6|7|11|8|@]|9|@]|A|$]]|$1|K|3|L|5|F|7|12|8|@]|9|@]|A|$G|H]]|$1|M|3|N|5|6|7|13|8|@]|9|@]|A|$]]|$1|O|3|P|5|F|7|14|8|@]|9|@]|A|$G|H]]|$1|Q|3|R|5|6|7|15|8|@]|9|@]|A|$]]|$1|S|3|T|5|F|7|16|8|@]|9|@]|A|$G|H]]|$1|U|3|V|5|6|7|17|8|@]|9|@]|A|$]]|$1|W|3|-4|5|6|7|18|8|@]|9|@]|A|$]]]|X|$]]

I followed these steps:

Pull the master:

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

This will sync your local repo with the Github repo. Add your new file and then:

<pre><code>git add .
</code></pre>

Commit the changes:

<pre><code>git commit -m "adding new file Xyz"
</code></pre>

Finally, push the origin master:

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

Refresh your Github repo, you will see the newly added files.

blocks|key|2788821|text|如果您使用的是Visual+S2019，请创建一个新的本地分支，如下所示，然后将更改推送到存储库。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2788822|​|2788823|📷|atomic|offset|length|2788824|2788825|entityMap|0|IMAGE|mutability|IMMUTABLE|imageUrl|https://ask.qcloudimg.com/http-save/yehe-900000/36790082de03c314042c0b0b3a793e34.png|imageAlt^0|0|0|0|1|0|0|0^^$0|@$1|2|3|4|5|6|7|S|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|T|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|U|8|@]|9|@$G|V|H|W|1|X]]|A|$]]|$1|I|3|C|5|6|7|Y|8|@]|9|@]|A|$]]|$1|J|3|-4|5|6|7|Z|8|@]|9|@]|A|$]]]|K|$L|$5|M|N|O|A|$P|Q|R|-4]]]]

If you are using Visual S2019, Create a new local branch as shown in following, and then push the changes to the repo.
<a href="https://i.stack.imgur.com/8a4LX.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/8a4LX.png" alt="VS2019 local branch" /></a>

blocks|key|177205|text|这个问题是因为本地分支与主分支不是最新的，这就是为什么我们应该在将代码推送到git之前拉出代码。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|177206|git+add+.
git+commit+-m+'Comments+to+be+added'
git+pull+origin+master
git+push+origin+master|code-block|syntax|javascript|177207|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|$]]

The issue is because the local is not up-to-date with the master branch that is why we are supposed to pull the code before pushing it to the git
<pre><code>git add .
git commit -m 'Comments to be added'
git pull origin master
git push origin master
</code></pre>

blocks|key|178684|text|在推送了最后一次提交之后，我直接在repo中手动编辑了几个文件，结果得到了相同的错误。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|178685|使用git+push+-f+origin+master而不是git+push+origin+master来强制更新。|offset|length|style|CODE|178686|但是，只有当您确切地知道repo中发生了什么更改，并且您100%25确信您希望本地提交替换所有内容时，才会建议您这样做。我的是一个业余爱好项目，没有其他人在做，除了手动更改之外，没有任何其他的设备提交。|178687|entityMap^0|0|2|P|U|M|0|0^^$0|@$1|2|3|4|5|6|7|L|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|M|8|@$D|N|E|O|F|G]|$D|P|E|Q|F|G]]|9|@]|A|$]]|$1|H|3|I|5|6|7|R|8|@]|9|@]|A|$]]|$1|J|3|-4|5|6|7|S|8|@]|9|@]|A|$]]]|K|$]]

I manually edited a couple files directly in the repo after I had pushed the last commit and got the same error as a result.
Instead of <code>git push origin master</code> use <code>git push -f origin master</code> to force an update.
Would only recommend doing this though if you know exactly what was changed in the repo and you're 100% confident you want the local commit to replace everything. Mine was a hobby project that no one else is working on and no other commits had been made from any other devices aside from the manual changes.

I created a new repo, cloned it, added files to the directory, added them with <code>add -A</code>, committed changes, and when I try to push using <code>git push &lt;repo name&gt; master</code> I get:
<blockquote>
hint: Updates were rejected because the remote contains work that you do not have locally. This is usually caused by another repository pushing to the same ref. You may want to first merge the remote changes (e.g.,
hint: 'git pull') before pushing again.
</blockquote>
This doesn't seem to make sense since it's a new repo and contains only a readme file.

Github "Updates were rejected because the remote contains work that you do not have locally."

服务器

GitHub

我创建了一个新的存储库，克隆它，将文件添加到目录，使用add -A添加它们，提交更改，当我尝试使用git push <repo name> master推送时，我得到：提示:更新被拒绝，因为远程服务器包含您在本地没有的工作。这通常是由另一个存储库推送到相同的ref造成的。在再次推送之前，您可能希望先合并远程更改(例如，...

问Github“更新被拒绝，因为远程包含您在本地没有的工作。”
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问Github“更新被拒绝，因为远程包含您在本地没有的工作。”EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问Github“更新被拒绝，因为远程包含您在本地没有的工作。”
EN