http://wiki.eijux.com/index.php?action=history&feed=atom&title=FAQ%3AGit
FAQ:Git - 版本历史
2026-05-19T10:44:37Z
本wiki上该页面的版本历史
MediaWiki 1.38.2
http://wiki.eijux.com/index.php?title=FAQ:Git&diff=436&oldid=prev
Eijux：/* fatal:refusing to merge unrelated histories. */
2020-09-19T14:05:39Z
<p><span dir="auto"><span class="autocomment">fatal:refusing to merge unrelated histories.</span></span></p>
<table style="background-color: #fff; color: #202122;" data-mw="interface">
<col class="diff-marker" />
<col class="diff-content" />
<col class="diff-marker" />
<col class="diff-content" />
<tr class="diff-title" lang="zh-Hans-CN">
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">←上一版本</td>
<td colspan="2" style="background-color: #fff; color: #202122; text-align: center;">2020年9月19日 (六) 22:05的版本</td>
</tr><tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l2">第2行：</td>
<td colspan="2" class="diff-lineno">第2行：</td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><br/></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><br/></td></tr>
<tr><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>== fatal:refusing to merge unrelated histories. ==</div></td><td class="diff-marker"></td><td style="background-color: #f8f9fa; color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #eaecf0; vertical-align: top; white-space: pre-wrap;"><div>== fatal:refusing to merge unrelated histories. ==</div></td></tr>
<tr><td class="diff-marker" data-marker="−"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div><del style="font-weight: bold; text-decoration: none;">原因：操作的远程分支和本地分支没有取得关系，操作被拒绝。</del></div></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;">=== 描述 ===</ins></div></td></tr>
<tr><td class="diff-marker" data-marker="−"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div><del style="font-weight: bold; text-decoration: none;">解决：</del></div></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;">在本地新建仓库（并非从服务器pull），修改本地内容之后，需要上传到服务器仓库，出现<syntaxhighlight lang="xml" inline>fatal:refusing to merge unrelated histories.</syntaxhighlight>，而被拒绝上传；<br/></ins></div></td></tr>
<tr><td class="diff-marker" data-marker="−"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div><del style="font-weight: bold; text-decoration: none;"># 在命令后添加“</del>'''<code>--allow-unrelated-histories</code>'''<del style="font-weight: bold; text-decoration: none;">”</del></div></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;">若此时从服务器pull代码到本地分支，亦出现：<syntaxhighlight lang="xml" inline>fatal:refusing to merge unrelated histories.</syntaxhighlight></ins></div></td></tr>
<tr><td class="diff-marker" data-marker="−"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #ffe49c; vertical-align: top; white-space: pre-wrap;"><div><del style="font-weight: bold; text-decoration: none;"># 或：从远程拉取对应分支再重新进行修改等操作</del></div></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;">=== 分析 ===</ins></div></td></tr>
<tr><td colspan="2" class="diff-side-deleted"></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;">远程仓库分支与本地分支没有共同commit，git 会判定这两个仓库可能不是同一个，push（或pull）代码意味着需要合并两个不同的开始提交的仓库，所以出现此信息以防止误传。</ins></div></td></tr>
<tr><td colspan="2" class="diff-side-deleted"></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;">=== 解决 ===</ins></div></td></tr>
<tr><td colspan="2" class="diff-side-deleted"></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;">* 允许不相关历史合并：在命令后添加“</ins>'''<code>--allow-unrelated-histories</code>'''<ins style="font-weight: bold; text-decoration: none;">”（如：<code>git pull origin master --allow-unrelated-histories</code>）；</ins></div></td></tr>
<tr><td colspan="2" class="diff-side-deleted"></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;">* 先'''pull'''远程仓库到本地，再对本地仓库进行修改，可以确保是同一仓库的合并操作；</ins></div></td></tr>
<tr><td colspan="2" class="diff-side-deleted"></td><td class="diff-marker" data-marker="+"></td><td style="color: #202122; font-size: 88%; border-style: solid; border-width: 1px 1px 1px 4px; border-radius: 0.33em; border-color: #a3d3ff; vertical-align: top; white-space: pre-wrap;"><div><ins style="font-weight: bold; text-decoration: none;">* （排查并合并冲突）；</ins></div></td></tr>
</table>
Eijux
http://wiki.eijux.com/index.php?title=FAQ:Git&diff=421&oldid=prev
Eijux：建立内容为“category:Git == fatal:refusing to merge unrelated histories. == 原因：操作的远程分支和本地分支没有取得关系，操作被拒绝。 解决…”的新页面
2020-09-19T08:10:21Z
<p>建立内容为“<a href="/%E5%88%86%E7%B1%BB:Git" title="分类:Git">category:Git</a> == fatal:refusing to merge unrelated histories. == 原因：操作的远程分支和本地分支没有取得关系，操作被拒绝。 解决…”的新页面</p>
<p><b>新页面</b></p><div>[[category:Git]]<br />
<br />
== fatal:refusing to merge unrelated histories. ==<br />
原因：操作的远程分支和本地分支没有取得关系，操作被拒绝。<br />
解决：<br />
# 在命令后添加“'''<code>--allow-unrelated-histories</code>'''”<br />
# 或：从远程拉取对应分支再重新进行修改等操作</div>
Eijux