https://bigshans.github.io/categories/git/ Recent content in Git on Bigshans' Blog Hugo en bigshans Mon, 27 Sep 2021 11:57:02 +0800 https://bigshans.github.io/post/git-merge-unrealted-histories/ Mon, 27 Sep 2021 11:57:02 +0800 https://bigshans.github.io/post/git-merge-unrealted-histories/ <p>由于每次线上建仓库总会给我留一个文件，导致我仓库连接远程总是提示无法合并无关代码。这里就写统一写一下这个问题如何解决。</p> <pre><code class="language-shell">git pull origin master --allow-unrelated-histories </code></pre> <p><code>--allow-unrelated-histories</code> 用于强制合并无关历史。</p>