gitee更新代码库
<p>1、之前在gitee控制面板中直接更新了文件，导致了文件与本地的文件有区别</p><div class="cnblogs_code">
<pre>git pull</pre>
</div>
<p><span class="s1">error: You have not concluded your merge (MERGE_HEAD exists).</span></p>
<p class="p2"><span class="s1">hint: Please, commit your changes before merging.</span></p>
<p class="p1"><span class="s1">fatal: Exiting because of unfinished merge.</span></p>
<p class="p1"><span class="s1">2、到根目录中，执行</span></p>
<div class="cnblogs_Highlighter">
<pre class="brush:csharp;gutter:true;">git add .
</pre>
</div>
<p>3、git commit 要跟上-a</p>
<div class="cnblogs_code">
<pre>git commit -a -m <span style="color: rgba(128, 0, 0, 1)">"</span><span style="color: rgba(128, 0, 0, 1)">测试</span><span style="color: rgba(128, 0, 0, 1)">"</span> </pre>
</div>
<p>4、再次执行</p>
<div class="cnblogs_code">
<pre>git pull</pre>
</div>
<p class="p1"><span class="s1">hint: Pulling without specifying how to reconcile divergent branches is</span></p>
<p class="p1"><span class="s1">hint: discouraged. You can squelch this message by running one of the following</span></p>
<p class="p1"><span class="s1">hint: commands sometime before your next pull:</span></p>
<p class="p1"><span class="s1">hint:<span class="Apple-converted-space"> </span></span></p>
<p class="p1"><span class="s1">hint: <span class="Apple-converted-space"> git config pull.rebase false<span class="Apple-converted-space"> # merge (the default strategy)</span></span></span></p>
<p class="p1"><span class="s1">hint: <span class="Apple-converted-space"> git config pull.rebase true <span class="Apple-converted-space"> # rebase</span></span></span></p>
<p class="p1"><span class="s1">hint: <span class="Apple-converted-space"> git config pull.ff only <span class="Apple-converted-space"> # fast-forward only</span></span></span></p>
<p class="p1"><span class="s1">hint:<span class="Apple-converted-space"> </span></span></p>
<p class="p1"><span class="s1">hint: You can replace "git config" with "git config --global" to set a default</span></p>
<p class="p1"><span class="s1">hint: preference for all repositories. You can also pass --rebase, --no-rebase,</span></p>
<p class="p1"><span class="s1">hint: or --ff-only on the command line to override the configured default per</span></p>
<p class="p1"><span class="s1">hint: invocation.</span></p>
<p class="p2"><span class="s1">Already up to date.</span></p>
<p class="p2"> </p>
<p class="p2"><span class="s1">5、</span><span class="s1">git push origin master 提交到代码库中</span></p>
<div class="cnblogs_code">
<pre>git push origin master </pre>
</div>
<p> </p>
<p class="p1"><span class="s1">Enumerating objects: 86, done.</span></p>
<p class="p1"><span class="s1">Counting objects: 100% (73/73), done.</span></p>
<p class="p1"><span class="s1">Delta compression using up to 8 threads</span></p>
<p class="p1"><span class="s1">Compressing objects: 100% (33/33), done.</span></p>
<p class="p1"><span class="s1">Writing objects: 100% (46/46), 12.09 KiB | 2.01 MiB/s, done.</span></p>
<p class="p1"><span class="s1">Total 46 (delta 8), reused 0 (delta 0), pack-reused 0</span></p>
<p class="p1"><span class="s1">remote: Powered by <span class="s2"><strong>GITEE.COM </strong><span class="s1">[<span class="s3"><strong>GNK-6.4</strong><span class="s1">]</span></span></span></span></span></p>
<p class="p1"><span class="s1">To https://gitee.com/taiji85/flowable1-ui.git</span></p>
<p class="p1"><span class="s1"><span class="Apple-converted-space"> 569d51c..a8499e3<span class="Apple-converted-space"> master -> master</span></span></span></p>
</div>
<div id="MySignature" role="contentinfo">
道法自然<br><br>
来源：https://www.cnblogs.com/jiduoduo/p/16587522.html
頁:
[1]