git同步代码至github和gitee(码云)
<p class="Post-Title">我们有时候开发代码需要把代码同步到多个远程库中，如何操作才能做到呢？</p><div class="Post-RichTextContainer">
<div class="RichText ztext Post-RichText">
<p>我们知道，git是分布式版本控制系统，同步到多个远程库时，需要用不同的名称来标识不同的远程库，而git给远程库起的默认名称是origin。所以我们需要修改、配置名称，以关联不同远程库。有两种方式！</p>
<p>为了方便举例，我以GitHub和Gitee(码云)作为示例！</p>
<h2>同步方式</h2>
<h2>命令方式同步</h2>
<p>先删除已关联的名为origin的远程库：</p>
<div class="highlight">
<div class="cnblogs_code">
<pre>git remote rm origin</pre>
</div>
</div>
<p>然后，再关联GitHub的远程库：</p>
<div class="highlight">
<div class="cnblogs_code">
<pre>git remote add github git@github.com:chloneda/demo.git</pre>
</div>
</div>
<p>接着，再关联码云的远程库：</p>
<div class="highlight">
<div class="cnblogs_code">
<pre>git remote add gitee git@gitee.com:chloneda/demo.git</pre>
</div>
</div>
<h2>配置方式同步</h2>
<p>修改.git文件夹内的config文件：</p>
<div class="highlight">
<div class="cnblogs_code">
<pre><span style="color: rgba(0, 0, 0, 1)">
repositoryformatversion </span>= <span style="color: rgba(128, 0, 128, 1)">0</span><span style="color: rgba(0, 0, 0, 1)">
filemode </span>= <span style="color: rgba(0, 0, 255, 1)">true</span><span style="color: rgba(0, 0, 0, 1)">
bare </span>= <span style="color: rgba(0, 0, 255, 1)">false</span><span style="color: rgba(0, 0, 0, 1)">
logallrefupdates </span>= <span style="color: rgba(0, 0, 255, 1)">true</span><span style="color: rgba(0, 0, 0, 1)">
url </span>= git@github.com:chloneda/<span style="color: rgba(0, 0, 0, 1)">demo.git
fetch </span>= +refs/heads<span style="color: rgba(0, 128, 0, 1)">/*</span><span style="color: rgba(0, 128, 0, 1)">:refs/remotes/github/*
remote = origin
merge = refs/heads/master</span></pre>
</div>
</div>
<p>将上述文件内容内容复制，修改origin名称，内容如下：</p>
<div class="highlight">
<div class="cnblogs_code">
<pre><span style="color: rgba(0, 0, 0, 1)">
repositoryformatversion </span>= <span style="color: rgba(128, 0, 128, 1)">0</span><span style="color: rgba(0, 0, 0, 1)">
filemode </span>= <span style="color: rgba(0, 0, 255, 1)">true</span><span style="color: rgba(0, 0, 0, 1)">
bare </span>= <span style="color: rgba(0, 0, 255, 1)">false</span><span style="color: rgba(0, 0, 0, 1)">
logallrefupdates </span>= <span style="color: rgba(0, 0, 255, 1)">true</span><span style="color: rgba(0, 0, 0, 1)">
url </span>= git@github.com:chloneda/<span style="color: rgba(0, 0, 0, 1)">demo.git
fetch </span>= +refs/heads<span style="color: rgba(0, 128, 0, 1)">/*</span><span style="color: rgba(0, 128, 0, 1)">:refs/remotes/github/*
url = git@gitee.com:chloneda/demo.git
fetch = +refs/heads/*:refs/remotes/gitee/*
remote = origin
merge = refs/heads/master</span></pre>
</div>
</div>
<h2>查看远程库</h2>
<p>通过以上两种方式的任一种方式配置完成后，我们用</p>
<div class="cnblogs_code">
<pre>git remote -v</pre>
</div>
<p> </p>
<p>查看远程库信息：</p>
<div class="highlight">
<div class="cnblogs_code">
<pre>gitee git@gitee.com:chloneda/<span style="color: rgba(0, 0, 0, 1)">demo.git (fetch)
gitee git@gitee.com:chloneda</span>/<span style="color: rgba(0, 0, 0, 1)">demo.git (push)
githubgit@github.com:chloneda</span>/<span style="color: rgba(0, 0, 0, 1)">demo.git (fetch)
githubgit@github.com:chloneda</span>/demo.git (push)</pre>
</div>
<p> </p>
</div>
<p>可以看到两个远程库，说明配置生效了。</p>
<h2>上传代码</h2>
<div class="highlight">
<div class="cnblogs_code">
<pre><span style="color: rgba(0, 0, 0, 1)">git add .
git commit </span>-m <span style="color: rgba(128, 0, 0, 1)">"</span><span style="color: rgba(128, 0, 0, 1)">update</span><span style="color: rgba(128, 0, 0, 1)">"</span></pre>
</div>
<p> </p>
</div>
<h2>提交到github</h2>
<div class="highlight">
<div class="cnblogs_code">
<pre>git push github master</pre>
</div>
<p> </p>
</div>
<h2>提交到码云</h2>
<div class="highlight">
<div class="cnblogs_code">
<pre>git push gitee master</pre>
</div>
<p> </p>
</div>
<h2>更新代码</h2>
<div class="highlight">
<div class="cnblogs_code">
<pre><span style="color: rgba(0, 0, 0, 1)"># 从github拉取更新
git pull github
# 从gitee拉取更新
git pull gitee</span></pre>
</div>
<p> </p>
</div>
<h2>踩到的坑</h2>
<p>上述过程中，更新或提交代码时可能会遇到fatal:refusing to merge unrelated histories (拒绝合并无关的历史) 错误，解决办法：</p>
<p>首先将远程仓库和本地仓库关联起来。</p>
<div class="highlight">
<div class="cnblogs_code">
<pre>git branch --<span style="color: rgba(0, 0, 255, 1)">set</span>-upstream-to=origin/remote_branchyour_branch</pre>
</div>
</div>
<p>其中，origin/remote_branch是你本地分支对应的远程分支，your_branch是你当前的本地分支。</p>
<p>然后使用git pull整合远程仓库和本地仓库。</p>
<div class="highlight">
<div class="cnblogs_code">
<pre>git pull --allow-unrelated-histories //(忽略版本不同造成的影响)</pre>
</div>
<p> </p>
</div>
<p>重新更新、提交即可。</p>
<p>如遇到 Git没有共同祖先的两个分支合并 的情形请自行查询！</p>
<p> </p>
<p>注：本文出自博主 Chloneda https://zhuanlan.zhihu.com/p/71163868</p>
</div>
</div><br><br>
来源：https://www.cnblogs.com/HDWdemo/p/12666629.html
頁:
[1]