<?xml version="1.0" encoding="UTF-8"?><rss version="2.0"
	xmlns:content="http://purl.org/rss/1.0/modules/content/"
	xmlns:wfw="http://wellformedweb.org/CommentAPI/"
	xmlns:dc="http://purl.org/dc/elements/1.1/"
	xmlns:atom="http://www.w3.org/2005/Atom"
	xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
	xmlns:slash="http://purl.org/rss/1.0/modules/slash/"
	>

<channel>
	<title>merge | SDT 攻城獅區</title>
	<atom:link href="https://sdt.hameba.tw/tag/merge/feed/" rel="self" type="application/rss+xml" />
	<link>https://sdt.hameba.tw</link>
	<description>由Steven, Der, Ted 三位高級打字員所組成，是三位工程師(攻城獅)所維護的技術分享平台，或許偶爾會分享一些日常，有任何問題或是錯誤的部分，歡迎留言告訴我們！</description>
	<lastBuildDate>Fri, 28 Feb 2020 07:41:48 +0800</lastBuildDate>
	<language>zh-TW</language>
	<sy:updatePeriod>
	hourly	</sy:updatePeriod>
	<sy:updateFrequency>
	1	</sy:updateFrequency>
	<generator>https://wordpress.org/?v=5.3</generator>

<image>
	<url>https://sdt.hameba.tw/wp-content/uploads/2020/02/hameba_favicon-150x150.png</url>
	<title>merge | SDT 攻城獅區</title>
	<link>https://sdt.hameba.tw</link>
	<width>32</width>
	<height>32</height>
</image> 
	<item>
		<title>解決 git merge 不同分支出現 fatal: refusing to merge unrelated histories</title>
		<link>https://sdt.hameba.tw/580/?utm_source=rss&#038;utm_medium=rss&#038;utm_campaign=%25e8%25a7%25a3%25e6%25b1%25ba-git-merge-%25e4%25b8%258d%25e5%2590%258c%25e5%2588%2586%25e6%2594%25af%25e5%2587%25ba%25e7%258f%25be-fatal-refusing-to-merge-unrelated-histories</link>
				<comments>https://sdt.hameba.tw/580/#respond</comments>
				<pubDate>Fri, 28 Feb 2020 07:40:54 +0000</pubDate>
		<dc:creator><![CDATA[Hsu Steven]]></dc:creator>
				<category><![CDATA[Other]]></category>
		<category><![CDATA[git]]></category>
		<category><![CDATA[merge]]></category>

		<guid isPermaLink="false">https://sdt.hameba.tw/?p=580</guid>
				<description><![CDATA[<p>在做不同分支repository合併結果出現: fatal: refusing to merge unrela &#8230; </p>
<p class="link-more"><a href="https://sdt.hameba.tw/580/" class="more-link">閱讀全文<span class="screen-reader-text">〈解決 git merge 不同分支出現 fatal: refusing to merge unrelated histories〉</span></a></p>
The post <a href="https://sdt.hameba.tw/580/">解決 git merge 不同分支出現 fatal: refusing to merge unrelated histories</a> first appeared on <a href="https://sdt.hameba.tw">SDT 攻城獅區</a>.]]></description>
								<content:encoded><![CDATA[<p>在做不同分支repository合併結果出現:</p>
<p>fatal: refusing to merge unrelated histories.</p>
<p><span id="more-580"></span></p>
<p>明明是同一包分開做的結果出現無相關的提示..</p>
<p># <strong>從 git 2.9.0 開始預設行為不允許合併沒有共同祖先的分支。</strong></p>
<p>幸好只要加上 &#8211;allow-unrelated-histories 此參數即可以解決。</p><pre class="crayon-plain-tag">$ git merge master --allow-unrelated-histories</pre><p>&nbsp;</p>
<p>Reference</p>
<p><a href="https://stackoverflow.com/questions/37937984/git-refusing-to-merge-unrelated-histories-on-rebase" target="_blank" rel="noopener noreferrer">https://stackoverflow.com/questions/37937984/git-refusing-to-merge-unrelated-histories-on-rebase</a></p>The post <a href="https://sdt.hameba.tw/580/">解決 git merge 不同分支出現 fatal: refusing to merge unrelated histories</a> first appeared on <a href="https://sdt.hameba.tw">SDT 攻城獅區</a>.]]></content:encoded>
							<wfw:commentRss>https://sdt.hameba.tw/580/feed/</wfw:commentRss>
		<slash:comments>0</slash:comments>
							</item>
	</channel>
</rss>
