<?xml version="1.0"?>
<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="zh-Hans-CN">
	<id>https://wiki.riguz.com/index.php?action=history&amp;feed=atom&amp;title=Git%3A%E6%9B%BF%E6%8D%A2master%E5%88%86%E6%94%AF</id>
	<title>Git:替换master分支 - 版本历史</title>
	<link rel="self" type="application/atom+xml" href="https://wiki.riguz.com/index.php?action=history&amp;feed=atom&amp;title=Git%3A%E6%9B%BF%E6%8D%A2master%E5%88%86%E6%94%AF"/>
	<link rel="alternate" type="text/html" href="https://wiki.riguz.com/index.php?title=Git:%E6%9B%BF%E6%8D%A2master%E5%88%86%E6%94%AF&amp;action=history"/>
	<updated>2026-06-02T20:12:55Z</updated>
	<subtitle>本wiki上该页面的版本历史</subtitle>
	<generator>MediaWiki 1.42.3</generator>
	<entry>
		<id>https://wiki.riguz.com/index.php?title=Git:%E6%9B%BF%E6%8D%A2master%E5%88%86%E6%94%AF&amp;diff=2328&amp;oldid=prev</id>
		<title>Riguz：​已建立頁面，內容為 &quot;&lt;source lang=&quot;bash&quot;&gt; git checkout new-design git merge --strategy=ours --allow-unrelated-histories master git checkout master git merge new-design git push origin ma…&quot;</title>
		<link rel="alternate" type="text/html" href="https://wiki.riguz.com/index.php?title=Git:%E6%9B%BF%E6%8D%A2master%E5%88%86%E6%94%AF&amp;diff=2328&amp;oldid=prev"/>
		<updated>2019-12-31T06:51:55Z</updated>

		<summary type="html">&lt;p&gt;已建立頁面，內容為 &amp;quot;&amp;lt;source lang=&amp;quot;bash&amp;quot;&amp;gt; git checkout new-design git merge --strategy=ours --allow-unrelated-histories master git checkout master git merge new-design git push origin ma…&amp;quot;&lt;/p&gt;
&lt;p&gt;&lt;b&gt;新页面&lt;/b&gt;&lt;/p&gt;&lt;div&gt;&amp;lt;source lang=&amp;quot;bash&amp;quot;&amp;gt;&lt;br /&gt;
git checkout new-design&lt;br /&gt;
git merge --strategy=ours --allow-unrelated-histories master&lt;br /&gt;
git checkout master&lt;br /&gt;
git merge new-design&lt;br /&gt;
git push origin master&lt;br /&gt;
&amp;lt;/source&amp;gt;&lt;br /&gt;
&lt;br /&gt;
&lt;br /&gt;
[[Category:Linux/Unix]]&lt;/div&gt;</summary>
		<author><name>Riguz</name></author>
	</entry>
</feed>