Git如何回滚一次错误的合并 - wpsshop博客

查看

编辑修改

首页
UNITY
NODEJS
PYTHON
AI
GIT
PHP
GO
CEF3
JAVA
HTML
CSS

笔触狂放9

这个屌丝很懒，什么也没留下！

热门标签

jquery
HTML
CSS
PHP
ASP
PYTHON
GO
AI
C
C++
C#
PHOTOSHOP
UNITY
iOS
android
vue
xml
爬虫
SEO
LINUX
WINDOWS
JAVA
MFC
CEF3
CAD
NODEJS
GIT
Pyppeteer
article

热门文章

1手把手系列！使用 Zilliz Cloud 和 AWS Bedrock 搭建 RAG 应用
2kafka-消费者组-点对点测试
3华为OD机试 - 生成哈夫曼树（Java & JS & Python & C & C++）_生成哈夫曼树华为od
4计算机专业近几年的参考文献,近几年计算机专业发参考文献计算机专业发专著类参考文献哪里找...
5人工智能轨道交通行业周刊-第29期（2023.1.2-1.8）_昆明南站小红车机器人
6清览云题库--数据可视化
7消息队列:RabbitMQ_消息队列rabbitmq
8小华最多能得到多少克黄金【华为OD机试】(JAVA&Python&C++&JS题解)_小华按照地图去寻宝
9Makefile入门_makefile学习
10html标签“”中文本对齐实现，让人蛋疼的知识_html textarea跟前两行数据对齐</a></li></ul></div></div></div><link rel="stylesheet" href="https://cdn.wpsshop.cn/public/blog/css/mid_detail.css?v=890" type="text/css"><link rel="stylesheet" href="https://cdn.wpsshop.cn/public/blog/css/mid_clk.css?v=890" type="text/css"><script type="text/javascript" src="https://cdn.wpsshop.cn/public/blog/js/mid_.js?v=890"></script><link rel="stylesheet" href="https://cdn.wpsshop.cn/public/study/js/j/vs.css?v=890" type="text/css"><script type="text/javascript" src="https://cdn.wpsshop.cn/public/study/js/j/highlight.pack.js?v=890" ></script><link rel="stylesheet" href="https://cdn.wpsshop.cn/public/blog/css/index_contenthljs.css?v=890" type="text/css"><script type="text/javascript" src="https://cdn.wpsshop.cn/public/wpsshopindex/js/detail01tj.js?v=531890" ></script><link rel="stylesheet" href="https://cdn.wpsshop.cn/public/wpsshopindex/css/mid_detail_last.css?v=3890" type="text/css"><script type="text/javascript" src="https://cdn.wpsshop.cn/public/wpsshopindex/js/mid_detail_last.js?v=33890"></script><style type="text/css"></style><script type="text/javascript"></script><div class="interactive_info" id="body-data-0098" attrv="44826"></div><div class="article_box" style="overflow: hidden;"><div class="article_channel"><div class="channel_top_line"><div class="cn_t_l"></div><div class="cn_t_r"></div></div><div class="article_channel_info">当前位置: <a href="/article/list/1">article</a> > 正文 </div></div><div class="article_title"><h1>Git如何回滚一次错误的合并</h1></div><div class="article_info"><div class="article_c_info"> 作者：笔触狂放9 | 2024-05-30 01:58:42</div><div class="article_click" style="width: 140px;"><p class="operation-b-img operation-b-img-active"><i class="img-up txclick" attc="upclick" attn="0"></i><span class="num"> 赞</span></p><p class="operation-b-img operation-b-img-active"><i class="img-down txclick" attc="downclick" attn="0"></i><span class="num">踩</span></p></div></div><div class="article_intro">git合并错了如何回滚</div><div class="article_content article_contentheight"> <link rel="stylesheet" href="https://csdnimg.cn/release/blogv2/dist/mdeditor/css/editerView/kdoc_html_views-1a98987dfd.css"> <link rel="stylesheet" href="https://csdnimg.cn/release/blogv2/dist/mdeditor/css/editerView/ck_htmledit_views-044f2cf1dc.css"> <div id="content_views" class="htmledit_views"> <div class="article-content"> <blockquote> <p>原文发表在知乎专栏 <a href="https://link.juejin.im?target=https%3A%2F%2Fzhuanlan.zhihu.com%2Fp%2F40220954" rel="nofollow">前端杂货铺</a>, 欢迎关注我的专栏，转载请注明出处</p> </blockquote> <p>今天不说前端，来聊聊git吧。发现现在的小孩，玩框架一套一套的，等到玩点实质的工程化的东西就不行了。 git 这么好的工具，培训班怎么可以忽视他的重要性呢？</p> <h3 class="heading"><a name="t0"></a>再来聊聊git的工作流程</h3> <p>很多人对<a href="https://link.juejin.im?target=https%3A%2F%2Fgit-scm.com%2Fbook%2Fzh%2Fv2%2F%25E8%25B5%25B7%25E6%25AD%25A5-Git-%25E5%259F%25BA%25E7%25A1%2580" rel="nofollow">Git究竟是一个怎样的系统</a>，还是一知半解。在这里强烈建议大家先理解git的核心思想和工作原理，有过<code>subversion</code>或者<code>perforce</code>使用经验的人更是需要摒弃之前所见所学，重新接受这样一个新思想。我们不再这里赘述其几本原理，我们来介绍一下其简单工作流程。 Git以一个自有的思维框架管理着三个不同的盒子<code>Commit History</code>、<code>INDEX</code>、<code>Working Directory</code>。</p> <ul><li><code>Commit History</code> 历史记录，存储着所有提交的版本快照，并由当前分支引用的指针HEAD指向该分支最新一条提交。</li><li><code>INDEX</code> 索引，也叫暂存区域。它是一个文件，保存着即将提交的文件列表快照。</li><li><code>Working Directory</code> 工作目录，是从git仓库压缩数据当前版本中解包出来的文件列表。所以你在本地磁盘看到的你项目源码的文件列表，其实就是git开放给你的一个沙盒。在你将文件的修改天道到暂存区域并将快照记录到历史之前，你可以随意更改。</li></ul> <p>理解了这三者的含义后，我们试着来理解一下git的工作流程。一切的开始，混沌之间，我们要干一件大事，在terminal里面敲打了几下键盘</p> <pre data-index="0" class="set-code-show" name="code"><code class="hljs git copyable language-csharp" lang="git"><ol class="hljs-ln" style="width:100%"><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="1"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">git <span class="hljs-keyword">init</span> </div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="2"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">复制代码</div></div></li></ol></code><div class="hljs-button signin active" data-title="登录复制" data-report-click="{"spm":"1001.2101.3001.4334"}" onclick="hljs.signin(event)"></div></pre> <p>混沌初开，幻化三界：<code>HEAD</code>、<code>INDEX</code>、<code>Working Directory</code>。这就是世界最开始的样子git仓库仿佛就是掌管三界之神。而<code>Working Directory</code>就是他分配给你生产和工作的地方，你可以在这里肆意的创造。而为了安全和管理的有序我们需要把我们的添加与修改的文件交给git仓库。Git首先会将修改的文件标记起来放入暂存区、然后git找到暂存区域的文件内容将其永久性的存储为快照到git仓库，此时<code>HEAD</code>的指针指向这个最新的快照。</p> <p></p> <figure> <figcaption></figcaption> </figure> <p></p> <p>如图，总结下三个步骤</p> <ol><li>在工作目录中修改文件。</li><li>暂存文件，将文件的快照放入暂存区域。<code>git add</code></li><li>提交更新，找到暂存区域的文件，将快照永久性存储到 Git 仓库目录 <code>git commit</code></li></ol> <p>git 的基本工作流程就是在不断的重复这三个步骤,最终git仓库目录形成了一个快照堆栈，每产生一次新的版本，HEAD就会指向这个版本。</p> <p>这里我们创建了下面这些文件：</p> <pre data-index="1" class="set-code-show" name="code"><code class="hljs bash copyable language-bash"><ol class="hljs-ln" style="width:100%"><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="1"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">├── README.md</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="2"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">├── v1.js</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="3"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">├── v2.js</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="4"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">└── v3.js</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="5"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"> </div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="6"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">复制代码</div></div></li></ol></code><div class="hljs-button signin active" data-title="登录复制" data-report-click="{"spm":"1001.2101.3001.4334"}" onclick="hljs.signin(event)"></div></pre> <p>形成了下图的提交历史</p> <pre data-index="2" class="set-code-show" name="code"><code class="hljs git copyable language-cobol" lang="git"><ol class="hljs-ln" style="width:100%"><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="1"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"> </div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="2"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"><span class="hljs-number">3</span>aa<span class="hljs-number">5</span>dfb v<span class="hljs-number">3</span> (<span class="hljs-operator"><</span>- HEAD)</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="3"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"> |</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="4"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"><span class="hljs-number">5</span>aab<span class="hljs-number">391</span> v<span class="hljs-number">2</span></div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="5"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"> |</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="6"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">ff<span class="hljs-number">7</span>b<span class="hljs-number">88</span>e v<span class="hljs-number">1</span></div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="7"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"> |</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="8"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"><span class="hljs-number">95</span>d<span class="hljs-number">7816</span> init <span class="hljs-keyword">commit</span></div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="9"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"> </div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="10"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">复制代码</div></div></li></ol></code><div class="hljs-button signin active" data-title="登录复制" data-report-click="{"spm":"1001.2101.3001.4334"}" onclick="hljs.signin(event)"></div></pre> <p>下面我们来看看怎么利用checkout、reset、revert 来操作这个仓库目录</p> <h3 class="heading"><a name="t1"></a>checkout 、reset 还是 revert ？</h3> <h4 class="heading"><a name="t2"></a>checkout</h4> <p>版本控制系统背后的思想就是「安全」地储存项目的拷贝，这样你永远不用担心什么时候不可复原地破坏了你的代码库。当你建立了项目历史之后，git checkout 是一种便捷的方式，来将保存的快照「解包」到你的工作目录上去。 <code>git checkout</code> 可以检出提交、也可以检出单个文件甚至还可以检出分支(此处省略)。</p> <pre data-index="3" class="set-code-show" name="code"><code class="hljs s copyable language-cobol"><ol class="hljs-ln" style="width:100%"><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="1"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">git checkout <span class="hljs-number">5</span>aab<span class="hljs-number">391</span></div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="2"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">复制代码</div></div></li></ol></code><div class="hljs-button signin active" data-title="登录复制" data-report-click="{"spm":"1001.2101.3001.4334"}" onclick="hljs.signin(event)"></div></pre> <p>检出v2,当前工作目录和<code>5aab391</code>完全一致，你可以查看这个版本的文件编辑、运行、测试都不会被保存到git仓库里面。你可以<code>git checkout master</code> 或者 <code>git checkout -</code>回到原来的工作状态上来。</p> <pre data-index="4" class="set-code-show" name="code"><code class="hljs s copyable language-cobol"><ol class="hljs-ln" style="width:100%"><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="1"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">git checkout <span class="hljs-number">5</span>aab<span class="hljs-number">391</span> v<span class="hljs-number">1</span>.js</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="2"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">复制代码</div></div></li></ol></code><div class="hljs-button signin active" data-title="登录复制" data-report-click="{"spm":"1001.2101.3001.4334"}" onclick="hljs.signin(event)"></div></pre> <p>以检出v2版本对于v1.js的改动，只针对v1.js这个文件检出到<code>5aab391</code>版本。所以它会影响你当前的工作状态，它会把当前状态的v1.js文件内容覆盖为<code>5aab391</code>版本。所以除非你清楚你在做什么，最好不要轻易的做这个操作。但这个操作对于舍弃我当前的所有改动很有用：比如当前我在v1.js上面做了一些改动，但我又不想要这些改动了，而我又不想一个个去还原，那么我可以<code>git checkout HEAD v1.js</code> 或者 <code>git checkout -- v1.js</code></p> <h4 class="heading"><a name="t3"></a>reset 重置</h4> <p>和 <code>git checkout</code> 一样, <code>git reset</code> 有很多用法。</p> <pre data-index="5" class="set-code-show" name="code"><code class="hljs s copyable language-cobol"><ol class="hljs-ln" style="width:100%"><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="1"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">git <span class="hljs-keyword">reset</span> <span class="hljs-operator"><</span><span class="hljs-keyword">file</span><span class="hljs-operator">></span></div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="2"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">复制代码</div></div></li></ol></code><div class="hljs-button signin active" data-title="登录复制" data-report-click="{"spm":"1001.2101.3001.4334"}" onclick="hljs.signin(event)"></div></pre> <p>从暂存区移除特定文件，但不改变工作目录。它会取消这个文件的缓存，而不覆盖任何更改。</p> <pre data-index="6" class="set-code-show" name="code"><code class="hljs s copyable language-perl"><ol class="hljs-ln" style="width:100%"><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="1"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">git <span class="hljs-keyword">reset</span></div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="2"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">复制代码</div></div></li></ol></code><div class="hljs-button signin active" data-title="登录复制" data-report-click="{"spm":"1001.2101.3001.4334"}" onclick="hljs.signin(event)"></div></pre> <p>重置暂存区，匹配最近的一次提交，但工作目录不变。它会取消所有文件的暂存，而不会覆盖任何修改，给你了一个重设暂存快照的机会。</p> <pre data-index="7" class="set-code-show" name="code"><code class="hljs s copyable language-perl"><ol class="hljs-ln" style="width:100%"><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="1"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">git <span class="hljs-keyword">reset</span> --hard</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="2"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">复制代码</div></div></li></ol></code><div class="hljs-button signin active" data-title="登录复制" data-report-click="{"spm":"1001.2101.3001.4334"}" onclick="hljs.signin(event)"></div></pre> <p>加上<code>--hard</code>标记后会告诉git要重置缓存区和工作目录的更改，就是说：先将你的暂存区清除掉，然后将你所有未暂存的更改都清除掉，所以在使用前确定你想扔掉所有的本地工作。</p> <pre data-index="8" class="set-code-show" name="code"><code class="hljs s copyable language-cobol"><ol class="hljs-ln" style="width:100%"><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="1"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">git <span class="hljs-keyword">reset</span> <span class="hljs-operator"><</span><span class="hljs-keyword">commit</span><span class="hljs-operator">></span></div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="2"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">复制代码</div></div></li></ol></code><div class="hljs-button signin active" data-title="登录复制" data-report-click="{"spm":"1001.2101.3001.4334"}" onclick="hljs.signin(event)"></div></pre> <p>将当前分支的指针HEAD移到，将缓存区重设到这个提交，但不改变工作目录。所有之后的更改会保留在工作目录中，这允许你用更干净、原子性的快照重新提交项目历史。</p> <pre data-index="9" class="set-code-show" name="code"><code class="hljs s copyable language-cobol"><ol class="hljs-ln" style="width:100%"><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="1"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">git <span class="hljs-keyword">reset</span> --hard <span class="hljs-operator"><</span><span class="hljs-keyword">commit</span><span class="hljs-operator">></span></div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="2"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">复制代码</div></div></li></ol></code><div class="hljs-button signin active" data-title="登录复制" data-report-click="{"spm":"1001.2101.3001.4334"}" onclick="hljs.signin(event)"></div></pre> <p>将当前分支的指针HEAD移到，将缓存区和工作目录都重设到这个提交。它不仅清除了未提交的更改，同时还清除了之后的所有提交。</p> <p>可以看出，<code>git reset</code> 通过取消缓存或者取消一系列提交的操作会摒弃一些你当前工作目录上的更改，这样的操作带有一定的危险性。下面我们开始介绍一种相对稳妥的方式 <code>revert</code></p> <h4 class="heading"><a name="t4"></a>revert 撤销</h4> <p><code>git revert</code>被用来撤销一个已经提交的快照。但实现上和reset是完全不同的。通过搞清楚如何撤销这个提交引入的更改，然后在最后加上一个撤销了更改的新提交，而不是从项目历史中移除这个提交。</p> <pre data-index="10" class="set-code-show" name="code"><code class="hljs s copyable language-cobol"><ol class="hljs-ln" style="width:100%"><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="1"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">git revert <span class="hljs-operator"><</span><span class="hljs-keyword">commit</span><span class="hljs-operator">></span></div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="2"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">复制代码</div></div></li></ol></code><div class="hljs-button signin active" data-title="登录复制" data-report-click="{"spm":"1001.2101.3001.4334"}" onclick="hljs.signin(event)"></div></pre> <p>生成一个撤消了引入的修改的新提交，然后应用到当前分支。</p> <p></p> <figure> <figcaption></figcaption> </figure> <p></p> <p>例如：</p> <pre data-index="11" class="set-code-show" name="code"><code class="hljs s copyable language-cobol"><ol class="hljs-ln" style="width:100%"><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="1"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"><span class="hljs-number">81</span>f<span class="hljs-number">734</span>d <span class="hljs-keyword">commit</span> <span class="hljs-keyword">after</span> bug</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="2"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"> |</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="3"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"><span class="hljs-number">3</span>a<span class="hljs-number">395</span>af bug</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="4"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"> |</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="5"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"><span class="hljs-number">3</span>aa<span class="hljs-number">5</span>dfb v<span class="hljs-number">3</span> (<span class="hljs-operator"><</span>- HEAD)</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="6"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"> |</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="7"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"><span class="hljs-number">5</span>aab<span class="hljs-number">391</span> v<span class="hljs-number">2</span></div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="8"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"> |</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="9"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">ff<span class="hljs-number">7</span>b<span class="hljs-number">88</span>e v<span class="hljs-number">1</span></div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="10"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"> |</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="11"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"><span class="hljs-number">95</span>d<span class="hljs-number">7816</span> init <span class="hljs-keyword">commit</span></div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="12"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"> </div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="13"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">复制代码</div></div></li></ol></code><div class="hljs-button signin active" data-title="登录复制" data-report-click="{"spm":"1001.2101.3001.4334"}" onclick="hljs.signin(event)"></div></pre> <p>我们在<code>3a395af</code> 引入了一个bug，我们明确是由于<code>3a395af</code>造成的bug的时候，以其我们通过新的提交来fix这个bug，不如<code>git revert</code>, 让他来帮你剔除这个bug。</p> <pre data-index="12" class="set-code-show" name="code"><code class="hljs s copyable language-cobol"><ol class="hljs-ln" style="width:100%"><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="1"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">git revert <span class="hljs-number">3</span>a<span class="hljs-number">395</span>af</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="2"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">复制代码</div></div></li></ol></code><div class="hljs-button signin active" data-title="登录复制" data-report-click="{"spm":"1001.2101.3001.4334"}" onclick="hljs.signin(event)"></div></pre> <p>得到结果</p> <pre data-index="13" class="set-code-show" name="code"><code class="hljs s copyable language-cobol"><ol class="hljs-ln" style="width:100%"><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="1"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">cfb<span class="hljs-number">71</span>fc Revert <span class="hljs-string">"bug"</span></div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="2"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"> |</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="3"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"><span class="hljs-number">81</span>f<span class="hljs-number">734</span>d <span class="hljs-keyword">commit</span> <span class="hljs-keyword">after</span> bug</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="4"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"> |</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="5"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"><span class="hljs-number">3</span>a<span class="hljs-number">395</span>af bug</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="6"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"> |</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="7"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"><span class="hljs-number">3</span>aa<span class="hljs-number">5</span>dfb v<span class="hljs-number">3</span> (<span class="hljs-operator"><</span>- HEAD)</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="8"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"> |</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="9"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"><span class="hljs-number">5</span>aab<span class="hljs-number">391</span> v<span class="hljs-number">2</span></div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="10"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"> |</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="11"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">ff<span class="hljs-number">7</span>b<span class="hljs-number">88</span>e v<span class="hljs-number">1</span></div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="12"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"> |</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="13"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"><span class="hljs-number">95</span>d<span class="hljs-number">7816</span> init <span class="hljs-keyword">commit</span></div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="14"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"> </div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="15"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">复制代码</div></div></li></ol></code><div class="hljs-button signin active" data-title="登录复制" data-report-click="{"spm":"1001.2101.3001.4334"}" onclick="hljs.signin(event)"></div></pre> <p>这个时候bug的改动被撤销了，产生了一个新的commit，但是<code>commit after bug</code>没有被清初。</p> <p>所以相较于<code>reset</code> ，<code>revert</code>不会改变项目历史，对那些已经发布到共享仓库的提交来说这是一个安全的操作。其次<code>git revert</code>可以将提交历史中的任何一个提交撤销、而<code>reset</code>会把历史上某个提交及之后所有的提交都移除掉，这太野蛮了。</p> <p>另外<code>revert</code>的设计，还有一个考量，那就是撤销一个公共仓库的提交。至于为什么不能用<code>reset</code>，你们可以自己思考一下。下面我们就用一个麻烦事（回滚一个错误的合并），来讲解这个操作。</p> <h3 class="heading"><a name="t5"></a>合并操作</h3> <p>相对于常规的<code>commit</code>，当使用<code>git merge <branch></code>合并两个分支的时候，你会得到一个新的<code>merge commit</code>. 当我们<code>git show <commit></code>的时候会出现类似信息：</p> <pre data-index="14" class="set-code-show" name="code"><code class="hljs s copyable language-cobol"><ol class="hljs-ln" style="width:100%"><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="1"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"><span class="hljs-keyword">commit</span> <span class="hljs-number">6</span>dd<span class="hljs-number">0</span>e<span class="hljs-number">2</span>b<span class="hljs-number">9398</span>ca<span class="hljs-number">8</span>cd<span class="hljs-number">12</span>bfd<span class="hljs-number">1</span>faa<span class="hljs-number">1531</span>d<span class="hljs-number">86</span>dc<span class="hljs-number">41021</span>a</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="2"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"><span class="hljs-keyword">Merge</span>: d<span class="hljs-number">24</span>d<span class="hljs-number">3</span>b<span class="hljs-number">4</span> <span class="hljs-number">11</span>a<span class="hljs-number">7112</span></div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="3"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">Author: 前端杂货铺 </div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="4"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">...............</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="5"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">复制代码</div></div></li></ol></code><div class="hljs-button signin active" data-title="登录复制" data-report-click="{"spm":"1001.2101.3001.4334"}" onclick="hljs.signin(event)"></div></pre> <p><code>Merge: d24d3b4 11a7112</code> 这行表明了两个分支在合并时，所处的parent的版本线索。</p> <p>比如在上述项目中我们开出了一个dev分支并做了一些操作，现在分支的样子变成了这样：</p> <pre data-index="15" class="set-code-show" name="code"><code class="hljs s copyable language-cobol"><ol class="hljs-ln" style="width:100%"><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="1"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">init -<span class="hljs-operator">></span> v<span class="hljs-number">1</span> -<span class="hljs-operator">></span> v<span class="hljs-number">2</span> -<span class="hljs-operator">></span> v<span class="hljs-number">3</span> (master)</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="2"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"> \ </div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="3"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"> d<span class="hljs-number">1</span> -<span class="hljs-operator">></span> d<span class="hljs-number">2</span> (dev)</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="4"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">复制代码</div></div></li></ol></code><div class="hljs-button signin active" data-title="登录复制" data-report-click="{"spm":"1001.2101.3001.4334"}" onclick="hljs.signin(event)"></div></pre> <p>当我们在dev开发的差不多了</p> <pre data-index="16" class="set-code-show" name="code"><code class="hljs s copyable language-csharp"><ol class="hljs-ln" style="width:100%"><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="1"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"><span class="hljs-meta">#git:(dev)</span></div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="2"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">git checkout master </div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="3"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"><span class="hljs-meta">#git:(master)</span></div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="4"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">git merge dev</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="5"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">复制代码</div></div></li></ol></code><div class="hljs-button signin active" data-title="登录复制" data-report-click="{"spm":"1001.2101.3001.4334"}" onclick="hljs.signin(event)"></div></pre> <p>这个时候形成了一个Merge Commit <code>faulty merge</code></p> <pre data-index="17" class="set-code-show" name="code"><code class="hljs s copyable language-cobol"><ol class="hljs-ln" style="width:100%"><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="1"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">init -<span class="hljs-operator">></span> v<span class="hljs-number">1</span> -<span class="hljs-operator">></span> v<span class="hljs-number">2</span> -<span class="hljs-operator">></span> v<span class="hljs-number">3</span> -- faulty <span class="hljs-keyword">merge</span> (master)</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="2"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"> \ <span class="hljs-operator">/</span></div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="3"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"> d<span class="hljs-number">1</span> --<span class="hljs-operator">></span> d<span class="hljs-number">2</span> (dev)</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="4"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">复制代码</div></div></li></ol></code><div class="hljs-button signin active" data-title="登录复制" data-report-click="{"spm":"1001.2101.3001.4334"}" onclick="hljs.signin(event)"></div></pre> <p>此时<code>faulty merge</code>有两个parent 分别是v3 和 d2。</p> <h3 class="heading"><a name="t6"></a>回滚错误的合并</h3> <p>这个merge之后还继续在dev开发，另一波人也在从别的分支往master合并代码。变成这样：</p> <pre data-index="18" class="set-code-show" name="code"><code class="hljs s copyable language-cobol"><ol class="hljs-ln" style="width:100%"><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="1"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">init -<span class="hljs-operator">></span> v<span class="hljs-number">1</span> -<span class="hljs-operator">></span> v<span class="hljs-number">2</span> -<span class="hljs-operator">></span> v<span class="hljs-number">3</span> -- faulty <span class="hljs-keyword">merge</span> -<span class="hljs-operator">></span> v<span class="hljs-number">4</span> -<span class="hljs-operator">></span> vc<span class="hljs-number">3</span> (master)</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="2"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"> \ \ <span class="hljs-operator">/</span> <span class="hljs-operator">/</span></div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="3"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"> \ d<span class="hljs-number">1</span> --<span class="hljs-operator">></span> d<span class="hljs-number">2</span> --<span class="hljs-operator">></span> d<span class="hljs-number">3</span> --<span class="hljs-operator">></span> d<span class="hljs-number">4</span> (dev)<span class="hljs-operator">/</span></div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="4"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"> \ <span class="hljs-operator">/</span> </div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="5"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"> c<span class="hljs-number">1</span> --<span class="hljs-operator">></span> c<span class="hljs-number">2</span> -------------------c<span class="hljs-number">3</span> (<span class="hljs-keyword">other</span>)</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="6"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">复制代码</div></div></li></ol></code><div class="hljs-button signin active" data-title="登录复制" data-report-click="{"spm":"1001.2101.3001.4334"}" onclick="hljs.signin(event)"></div></pre> <p>这个时候你发现，妈也上次那个merge 好像给共享分支master引入了一个bug。这个bug导致团队其他同学跑不通测试，或者这是一个线上的bug，如果不及时修复老板要骂街了。</p> <p>这个时候第一想到的肯定是回滚代码，但怎么回滚呢。用<code>reset</code>?不现实，因为太流氓不说，还会把别人的代码也干掉，所以只能用<code>revert</code>。而<code>revert</code>它最初被设计出来就是干这个活的。</p> <p>怎么操作呢？首先想到的是上面所说的 <code>git revert <commit></code> ,但是貌似不太行。</p> <pre data-index="19" class="set-code-show" name="code"><code class="hljs s copyable language-cobol"><ol class="hljs-ln" style="width:100%"><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="1"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">git revert faulty <span class="hljs-keyword">merge</span></div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="2"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"><span class="hljs-keyword">error</span>: <span class="hljs-keyword">Commit</span> faulty <span class="hljs-keyword">merge</span> <span class="hljs-keyword">is</span> a <span class="hljs-keyword">merge</span> but <span class="hljs-keyword">no</span> -m option was given.</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="3"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">fatal: revert failed</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="4"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">复制代码</div></div></li></ol></code><div class="hljs-button signin active" data-title="登录复制" data-report-click="{"spm":"1001.2101.3001.4334"}" onclick="hljs.signin(event)"></div></pre> <p>这是因为试图撤销两个分支的合并的时候Git不知道要保留哪一个分支上的修改。所以我们需要告诉git我们保留那个分支<code>m</code> 或者<code>mainline</code>.</p> <pre data-index="20" class="set-code-show" name="code"><code class="hljs s copyable language-cobol"><ol class="hljs-ln" style="width:100%"><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="1"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">git revert -m <span class="hljs-number">1</span> faulty <span class="hljs-keyword">merge</span></div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="2"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">复制代码</div></div></li></ol></code><div class="hljs-button signin active" data-title="登录复制" data-report-click="{"spm":"1001.2101.3001.4334"}" onclick="hljs.signin(event)"></div></pre> <p><code>-m</code>后面带的参数值可以是1或者2，对应着parent的顺序.上面列子：1代表<code>v3</code>，2代表<code>d2</code> 所以该操作会保留master分支的修改，而撤销dev分支合并过来的修改。</p> <p>提交历史变为</p> <pre data-index="21" class="set-code-show" name="code"><code class="hljs s copyable language-cobol"><ol class="hljs-ln" style="width:100%"><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="1"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">init -<span class="hljs-operator">></span> v<span class="hljs-number">1</span> -<span class="hljs-operator">></span> v<span class="hljs-number">2</span> -<span class="hljs-operator">></span> v<span class="hljs-number">3</span> -- faulty <span class="hljs-keyword">merge</span> -<span class="hljs-operator">></span> v<span class="hljs-number">4</span> -<span class="hljs-operator">></span> vc<span class="hljs-number">3</span> -<span class="hljs-operator">></span> rev<span class="hljs-number">3</span> (master)</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="2"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"> \ <span class="hljs-operator">/</span> </div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="3"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"> d<span class="hljs-number">1</span> --<span class="hljs-operator">></span> d<span class="hljs-number">2</span> --<span class="hljs-operator">></span> d<span class="hljs-number">3</span> --<span class="hljs-operator">></span> d<span class="hljs-number">4</span> (dev)</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="4"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">复制代码</div></div></li></ol></code><div class="hljs-button signin active" data-title="登录复制" data-report-click="{"spm":"1001.2101.3001.4334"}" onclick="hljs.signin(event)"></div></pre> <p>此处<code>rev3</code>是一个常规commit，其内容包含了之前在<code>faulty merge</code>撤销掉的dev合并过来的commit的【反操作】的合集。</p> <p>到这个时候还没完，我们要记住，因为我们抛弃过之前dev合并过来的commit，下次dev再往master合并，之前抛弃过的其实是不包含在里面的。那怎么办呢？</p> <h3 class="heading"><a name="t7"></a>恢复之前的回滚</h3> <p>很简单我们把之前master那个带有【反操作】的commit给撤销掉不就好了？</p> <pre data-index="22" class="set-code-show" name="code"><code class="hljs s copyable language-cobol"><ol class="hljs-ln" style="width:100%"><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="1"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">git checkout master</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="2"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">git revert rev<span class="hljs-number">3</span></div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="3"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">git <span class="hljs-keyword">merge</span> dev</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="4"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">复制代码</div></div></li></ol></code><div class="hljs-button signin active" data-title="登录复制" data-report-click="{"spm":"1001.2101.3001.4334"}" onclick="hljs.signin(event)"></div></pre> <p>此时提交历史变成了</p> <pre data-index="23" class="set-code-show" name="code"><code class="hljs s copyable language-cobol"><ol class="hljs-ln" style="width:782px"><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="1"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">init -<span class="hljs-operator">></span> v<span class="hljs-number">1</span> -<span class="hljs-operator">></span> v<span class="hljs-number">2</span> -<span class="hljs-operator">></span> v<span class="hljs-number">3</span> -- faulty <span class="hljs-keyword">merge</span> -<span class="hljs-operator">></span> v<span class="hljs-number">4</span> -<span class="hljs-operator">></span> vc<span class="hljs-number">3</span> -<span class="hljs-operator">></span> rev<span class="hljs-number">3</span> -<span class="hljs-operator">></span> rev<span class="hljs-number">3</span>` -<span class="hljs-operator">></span> <span class="hljs-keyword">final</span> <span class="hljs-keyword">merge</span> (master)</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="2"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"> \ <span class="hljs-operator">/</span> <span class="hljs-operator">/</span></div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="3"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line"> d<span class="hljs-number">1</span> --<span class="hljs-operator">></span> d<span class="hljs-number">2</span> --<span class="hljs-operator">></span> d<span class="hljs-number">3</span> --<span class="hljs-operator">></span> d<span class="hljs-number">4</span> --------------------------------(dev)</div></div></li><li><div class="hljs-ln-numbers"><div class="hljs-ln-line hljs-ln-n" data-line-number="4"></div></div><div class="hljs-ln-code"><div class="hljs-ln-line">复制代码</div></div></li></ol></code><div class="hljs-button signin active" data-title="登录复制" data-report-click="{"spm":"1001.2101.3001.4334"}" onclick="hljs.signin(event)"></div></pre> <h3 class="heading"><a name="t8"></a>总结</h3> <p>以上就是我想要讲的关于git回滚代码的一些操作，有不对的地方还望指正。另Git 是一门艺术，是一种非常精妙的设计，当你使用上手后，你会发现越来越多好玩的东西，并为设计git的人默默点个赞。也希望在前端领域不论是初学还是深凿者，在追逐流行框架的时候，都不要忘了学习这些基础的工具。</p> <h3 class="heading"><a name="t9"></a>参考</h3> <ul><li>《pro git》</li><li><a href="https://link.juejin.im?target=https%3A%2F%2Fgit-scm.com%2Fbook%2Fzh%2Fv2%2FGit-%25E5%25B7%25A5%25E5%2585%25B7-%25E9%2587%258D%25E7%25BD%25AE%25E6%258F%25AD%25E5%25AF%2586" rel="nofollow">重置揭秘</a></li><li><a href="https://link.juejin.im?target=https%3A%2F%2Fgithub.com%2Fgeeeeeeeeek%2Fgit-recipes" rel="nofollow">git-recipes</a></li></ul> </div> </div><div data-report-view="{"mod":"1585297308_001","spm":"1001.2101.3001.6548","dest":"https://blog.csdn.net/weixin_34192993/article/details/91368071","extend1":"pc","ab":"new"}"><div></div></div> <div><div><span>声明：</span>本文内容由网友自发贡献，不代表【wpsshop博客】立场，版权归原作者所有，本站不承担相应法律责任。如您发现有侵权的内容，请联系我们。转载请注明出处：<a href="https://www.wpsshop.cn/w/笔触狂放9/article/detail/644826">https://www.wpsshop.cn/w/笔触狂放9/article/detail/644826</a></div></div></div><div class="article_recommend"><div class="list_top">推荐阅读</div><div class="ListItems"><ul class="NewsList"><li><div class="NewTitle"><a title="article" class="cat" href="/article/list/1" target="_blank">article<i></i></a><a title="AI实战训练营（Class 4）MMPretrain_ai大模型训练营" href="/w/小蓝xlanll/article/detail/644520" target="_blank">AI实战<em>训练营</em>（<em>Class</em> <em>4</em>）<em>MMPretr<em>ai</em>n</em>_<em>ai</em>大<em>模型</em><em>训练营</em>...</a></div><div class="NewsInfo"><div class="NewsDesc" style=""><a title="AI实战训练营（Class 4）MMPretrain_ai大模型训练营" href="/w/小蓝xlanll/article/detail/644520" target="_blank">请添加图片描述](https://img-blog.csdnimg.cn/226cff877e9a<em>4</em>05ba5<em>4</em>c70b... </a><div class="article_click rice1" style="width: 240px;float: left;"><p class="operation-b-img operation-b-img-active"><i class="img-up txclick" attc="upclick" attn="0"></i><span class="num"> 赞</span></p><p class="operation-b-img operation-b-img-active"><i class="img-down txclick" attc="downclick" attn="0"></i><span class="num">踩</span></p></div></div><div style="clear: both;"></div></div></li><li><div class="NewTitle"><a title="article" class="cat" href="/article/list/1" target="_blank">article<i></i></a><a title="拉勾网爬取(WebMagic+Selenium+ChromeDriver)_webmagic chr" href="/w/知新_RL/article/detail/645429" target="_blank">拉勾网爬取(<em>WebMagic</em>+<em>Selenium</em>+<em>ChromeDriver</em>)_<em>webmagic</em> chr...</a></div><div class="NewsInfo"><div class="NewsDesc" style=""><a title="拉勾网爬取(WebMagic+Selenium+ChromeDriver)_webmagic chr" href="/w/知新_RL/article/detail/645429" target="_blank">拉勾网爬取(自动化)<em>WebMagic</em>+<em>Selenium</em>+<em>ChromeDriver</em>实现浏览器自动化抓取。网页反扒做到难... </a><div class="article_click rice1" style="width: 240px;float: left;"><p class="operation-b-img operation-b-img-active"><i class="img-up txclick" attc="upclick" attn="0"></i><span class="num"> 赞</span></p><p class="operation-b-img operation-b-img-active"><i class="img-down txclick" attc="downclick" attn="0"></i><span class="num">踩</span></p></div></div><div style="clear: both;"></div></div></li><li><div class="NewTitle"><a title="article" class="cat" href="/article/list/1" target="_blank">article<i></i></a><a title="spark流式读取hdfs中数据_sparkstreaming消费方式及区别,spark读取hdfs" href="/w/知新_RL/article/detail/644744" target="_blank"><em>spark</em>流式<em>读取</em><em>hdfs</em>中<em>数据</em>_<em>spark</em>streaming消费方式及区别,<em>spark</em><em>读取</em><em>hdfs</em>...</a></div><div class="NewsInfo"><div class="NewsDesc" style=""><a title="spark流式读取hdfs中数据_sparkstreaming消费方式及区别,spark读取hdfs" href="/w/知新_RL/article/detail/644744" target="_blank">#<em>spark</em>-shellscala><em>spark</em>：一：流式<em>读取</em><em>数据</em> 即是不间断实时访问<em>读取</em><em>数据</em>import org.apa... </a><div class="article_click rice1" style="width: 240px;float: left;"><p class="operation-b-img operation-b-img-active"><i class="img-up txclick" attc="upclick" attn="0"></i><span class="num"> 赞</span></p><p class="operation-b-img operation-b-img-active"><i class="img-down txclick" attc="downclick" attn="0"></i><span class="num">踩</span></p></div></div><div style="clear: both;"></div></div></li><li><div class="NewTitle"><a title="article" class="cat" href="/article/list/1" target="_blank">article<i></i></a><a title="【Hadoop】HDFS的体系架构_hdfs框架" href="/w/weixin_40725706/article/detail/644673" target="_blank">【<em>Hadoop</em>】<em>HDFS</em><em>的</em>体系架构_<em>hdfs</em><em>框架</em>...</a></div><div class="NewsInfo"><div class="NewsDesc" style=""><a title="【Hadoop】HDFS的体系架构_hdfs框架" href="/w/weixin_40725706/article/detail/644673" target="_blank"><em>HDFS</em> 采用 Master/Slave 架构。一个 <em>HDFS</em> 集群是由一个 NameNode 和一定数目<em>的</em> DataN... </a><div class="article_click rice1" style="width: 240px;float: left;"><p class="operation-b-img operation-b-img-active"><i class="img-up txclick" attc="upclick" attn="0"></i><span class="num"> 赞</span></p><p class="operation-b-img operation-b-img-active"><i class="img-down txclick" attc="downclick" attn="0"></i><span class="num">踩</span></p></div></div><div style="clear: both;"></div></div></li><li><div class="NewTitle"><a title="article" class="cat" href="/article/list/1" target="_blank">article<i></i></a><a title="Xilinx基于PCIE的部分重配置实现（一）_xilinx vu13p如何设计支持pcie bif" href="/w/从前慢现在也慢/article/detail/644269" target="_blank"><em>Xilinx</em>基于<em>PCIE</em>的<em>部分</em>重<em>配置</em>实现（一）_<em>xilinx</em> <em>vu13p</em>如何设计支持pcie bif...</a></div><div class="NewsInfo"><div class="NewsDesc" style=""><a title="Xilinx基于PCIE的部分重配置实现（一）_xilinx vu13p如何设计支持pcie bif" href="/w/从前慢现在也慢/article/detail/644269" target="_blank">本博文主要是对基于<em>PCIE</em>（mcap）的<em>部分</em>可重构实现的步骤做一个简单的演示，如有错误之处，欢迎批评指正。值得说明的是，... </a><div class="article_click rice1" style="width: 240px;float: left;"><p class="operation-b-img operation-b-img-active"><i class="img-up txclick" attc="upclick" attn="0"></i><span class="num"> 赞</span></p><p class="operation-b-img operation-b-img-active"><i class="img-down txclick" attc="downclick" attn="0"></i><span class="num">踩</span></p></div></div><div style="clear: both;"></div></div></li><li><div class="NewTitle"><a title="article" class="cat" href="/article/list/1" target="_blank">article<i></i></a><a title="SUMO与NS3联合仿真分析_sumo和ns3联合仿真" href="/w/羊村懒王/article/detail/645502" target="_blank"><em>SUMO</em>与NS3<em>联合</em><em>仿真</em>分析_<em>sumo</em>和<em>ns3</em><em>联合</em><em>仿真</em>...</a></div><div class="NewsInfo"><div class="NewsDesc" style=""><a title="SUMO与NS3联合仿真分析_sumo和ns3联合仿真" href="/w/羊村懒王/article/detail/645502" target="_blank">利用<em>sumo</em>和NS3进行<em>联合</em><em>仿真</em>分析_<em>sumo</em>和<em>ns3</em><em>联合</em><em>仿真</em><em>sumo</em>和<em>ns3</em><em>联合</em><em>仿真</em> 安装环境... </a><div class="article_click rice1" style="width: 240px;float: left;"><p class="operation-b-img operation-b-img-active"><i class="img-up txclick" attc="upclick" attn="0"></i><span class="num"> 赞</span></p><p class="operation-b-img operation-b-img-active"><i class="img-down txclick" attc="downclick" attn="0"></i><span class="num">踩</span></p></div></div><div style="clear: both;"></div></div></li><li><div class="NewTitle"><a title="article" class="cat" href="/article/list/1" target="_blank">article<i></i></a><a title="ESP32基于Arduino框架，SD卡+MAX98357模块+MP3播放器_esp32 mp3播放" href="/w/weixin_40725706/article/detail/644630" target="_blank"><em>ESP32</em>基于<em>Arduino</em>框架，SD卡+<em>MAX98357</em>模块+MP3<em>播放器</em>_<em>esp32</em> mp3播放...</a></div><div class="NewsInfo"><div class="NewsDesc" style=""><a title="ESP32基于Arduino框架，SD卡+MAX98357模块+MP3播放器_esp32 mp3播放" href="/w/weixin_40725706/article/detail/644630" target="_blank"><em>ESP32</em>基于<em>Arduino</em>框架，SD卡+<em>MAX98357</em>模块+MP3<em>播放器</em>_<em>esp32</em> mp3<em>播放器</em><em>esp32</em> mp3... </a><div class="article_click rice1" style="width: 240px;float: left;"><p class="operation-b-img operation-b-img-active"><i class="img-up txclick" attc="upclick" attn="0"></i><span class="num"> 赞</span></p><p class="operation-b-img operation-b-img-active"><i class="img-down txclick" attc="downclick" attn="0"></i><span class="num">踩</span></p></div></div><div style="clear: both;"></div></div></li><li><div class="NewTitle"><a title="article" class="cat" href="/article/list/1" target="_blank">article<i></i></a><a title="三分钟入门AGI与ChatGPT：小白也能懂的大语言模型" href="/w/我家自动化/article/detail/645585" target="_blank">三分钟入门<em>AGI</em>与<em>ChatGPT</em><em>：</em>小白也<em>能</em>懂<em>的</em>大<em>语言</em><em>模型</em>...</a></div><div class="NewsInfo"><div class="NewsDesc" style=""><a title="三分钟入门AGI与ChatGPT：小白也能懂的大语言模型" href="/w/我家自动化/article/detail/645585" target="_blank">1. AI、<em>AGI</em>、AIGC是什么？AI<em>：</em>人工智<em>能</em>，让机器模仿人类智<em>能</em>解决问题。<em>AGI</em><em>：</em>通用人工智<em>能</em>，让机器像人一样思考... </a><div class="article_click rice1" style="width: 240px;float: left;"><p class="operation-b-img operation-b-img-active"><i class="img-up txclick" attc="upclick" attn="0"></i><span class="num"> 赞</span></p><p class="operation-b-img operation-b-img-active"><i class="img-down txclick" attc="downclick" attn="0"></i><span class="num">踩</span></p></div></div><div style="clear: both;"></div></div></li><li><div class="NewTitle"><a title="article" class="cat" href="/article/list/1" target="_blank">article<i></i></a><a title="OKR案例：用四象限开展高效的沟通_okr工作法可以简单地用四象限法表达，具体步骤如下： 1. 确定" href="/w/我家自动化/article/detail/644907" target="_blank"><em>OKR</em>案例<em>：</em><em>用</em><em>四</em><em>象限</em>开展高效的沟通_<em>okr</em><em>工作</em>法可以简单地<em>用</em><em>四</em><em>象限</em>法表达<em>，</em><em>具体步骤</em>如下<em>：</em> 1. 确定...</a></div><div class="NewsInfo"><div class="NewsDesc" style=""><a title="OKR案例：用四象限开展高效的沟通_okr工作法可以简单地用四象限法表达，具体步骤如下： 1. 确定" href="/w/我家自动化/article/detail/644907" target="_blank">在《<em>OKR</em><em>工作</em>法》中讲了一种<em>OKR</em>复盘利器——<em>四</em><em>象限</em>看板<em>，</em>这种方法也是在<em>OKR</em>管理中的沟通工具、汇报工具或者反馈工具<em>，</em>尤... </a><div class="article_click rice1" style="width: 240px;float: left;"><p class="operation-b-img operation-b-img-active"><i class="img-up txclick" attc="upclick" attn="0"></i><span class="num"> 赞</span></p><p class="operation-b-img operation-b-img-active"><i class="img-down txclick" attc="downclick" attn="0"></i><span class="num">踩</span></p></div></div><div style="clear: both;"></div></div></li><li><div class="NewTitle"><a title="article" class="cat" href="/article/list/1" target="_blank">article<i></i></a><a title="嵌入式QT (使用 Qt Designer 开发)_qt开发嵌入式" href="/w/繁依Fanyi0/article/detail/645486" target="_blank"><em>嵌入式</em>QT (使用 Qt <em>Designer</em> <em>开发</em>)<em>_</em><em>qt</em><em>开发</em><em>嵌入式</em>...</a></div><div class="NewsInfo"><div class="NewsDesc" style=""><a title="嵌入式QT (使用 Qt Designer 开发)_qt开发嵌入式" href="/w/繁依Fanyi0/article/detail/645486" target="_blank">如果细心的同学，我们还发现这个 clicked()信号并不是 pushButton 的，而是 QAbstactButto... </a><div class="article_click rice1" style="width: 240px;float: left;"><p class="operation-b-img operation-b-img-active"><i class="img-up txclick" attc="upclick" attn="0"></i><span class="num"> 赞</span></p><p class="operation-b-img operation-b-img-active"><i class="img-down txclick" attc="downclick" attn="0"></i><span class="num">踩</span></p></div></div><div style="clear: both;"></div></div></li><li><div class="NewTitle"><a title="article" class="cat" href="/article/list/1" target="_blank">article<i></i></a><a title="人工智能轨道交通行业周刊-第24期（2022.11.21-11.27）_轨道交通 ai智能设计地铁" href="/w/weixin_40725706/article/detail/644063" target="_blank">人工<em>智能</em><em>轨道交通</em>行业周刊-第24期（2022.11.<em>21</em>-11.27）_<em>轨道交通</em> ai<em>智能</em><em>设计</em> <em>地铁</em>...</a></div><div class="NewsInfo"><div class="NewsDesc" style=""><a title="人工智能轨道交通行业周刊-第24期（2022.11.21-11.27）_轨道交通 ai智能设计地铁" href="/w/weixin_40725706/article/detail/644063" target="_blank">本期关键词：BIM应用、<em>地铁</em>控制中心、车辆检修<em>智能</em>化、模型轻量化、隧道通风_<em>轨道交通</em> ai<em>智能</em><em>设计</em> <em>地铁</em>结构<em>自动</em>出图轨道... </a><div class="article_click rice1" style="width: 240px;float: left;"><p class="operation-b-img operation-b-img-active"><i class="img-up txclick" attc="upclick" attn="0"></i><span class="num"> 赞</span></p><p class="operation-b-img operation-b-img-active"><i class="img-down txclick" attc="downclick" attn="0"></i><span class="num">踩</span></p></div></div><div style="clear: both;"></div></div></li><li><div class="NewTitle"><a title="article" class="cat" href="/article/list/1" target="_blank">article<i></i></a><a title="问答模型训练(一)_训练自己的问答模型" href="/w/2023面试高手/article/detail/645189" target="_blank"><em>问答</em><em>模型</em><em>训练</em>(一)_<em>训练</em>自己<em>的</em><em>问答</em><em>模型</em>...</a></div><div class="NewsInfo"><div class="NewsDesc" style=""><a title="问答模型训练(一)_训练自己的问答模型" href="/w/2023面试高手/article/detail/645189" target="_blank">参考AI Studio----基于bert<em>的</em><em>模型</em><em>的</em>机器阅读理解安装paddle2.0.2框架执行以下命令安装（推荐使用百... </a><div class="article_click rice1" style="width: 240px;float: left;"><p class="operation-b-img operation-b-img-active"><i class="img-up txclick" attc="upclick" attn="0"></i><span class="num"> 赞</span></p><p class="operation-b-img operation-b-img-active"><i class="img-down txclick" attc="downclick" attn="0"></i><span class="num">踩</span></p></div></div><div style="clear: both;"></div></div></li><li><div class="NewTitle"><a title="article" class="cat" href="/article/list/1" target="_blank">article<i></i></a><a title="05. Redis 持久化" href="/w/从前慢现在也慢/article/detail/645125" target="_blank">05. <em>Redis</em> <em>持久</em>化...</a></div><div class="NewsInfo"><div class="NewsDesc" style=""><a title="05. Redis 持久化" href="/w/从前慢现在也慢/article/detail/645125" target="_blank">在指定的时间间隔内，将内存中的数据集快照写入磁盘，也就是 Snapshot 快照，它恢复时是将快照文件直接读到内存里。R... </a><div class="article_click rice1" style="width: 240px;float: left;"><p class="operation-b-img operation-b-img-active"><i class="img-up txclick" attc="upclick" attn="0"></i><span class="num"> 赞</span></p><p class="operation-b-img operation-b-img-active"><i class="img-down txclick" attc="downclick" attn="0"></i><span class="num">踩</span></p></div></div><div style="clear: both;"></div></div></li><li><div class="NewTitle"><a title="article" class="cat" href="/article/list/1" target="_blank">article<i></i></a><a title="微信小程序+esp8266NodeMcu(cp2102)+onenet物联平台（二）_esp8266" href="/w/花生_TL007/article/detail/644220" target="_blank">微信小程序+<em>esp8266NodeMcu</em>(<em>cp2102</em>)+<em>onenet</em>物联<em>平台</em>（二）_esp8266...</a></div><div class="NewsInfo"><div class="NewsDesc" style=""><a title="微信小程序+esp8266NodeMcu(cp2102)+onenet物联平台（二）_esp8266" href="/w/花生_TL007/article/detail/644220" target="_blank">上一篇文章介绍了<em>onenet</em><em>平台</em>注册及设备连接，接下来介绍，如何使用Arduino IDE编写代码，控制esp8266，... </a><div class="article_click rice1" style="width: 240px;float: left;"><p class="operation-b-img operation-b-img-active"><i class="img-up txclick" attc="upclick" attn="0"></i><span class="num"> 赞</span></p><p class="operation-b-img operation-b-img-active"><i class="img-down txclick" attc="downclick" attn="0"></i><span class="num">踩</span></p></div></div><div style="clear: both;"></div></div></li><li><div class="NewTitle"><a title="article" class="cat" href="/article/list/1" target="_blank">article<i></i></a><a title="pat乙级1004题解（c++)_c加加1004练习题" href="/w/Monodyee/article/detail/645620" target="_blank"><em>pat</em>乙级<em>1004</em>题解（<em>c</em>++)<em>_</em><em>c</em>加加<em>1004</em><em>练习题</em>...</a></div><div class="NewsInfo"><div class="NewsDesc" style=""><a title="pat乙级1004题解（c++)_c加加1004练习题" href="/w/Monodyee/article/detail/645620" target="_blank"><em>1004</em> 成绩排名读入 n（>0）名学生的姓名、学号、成绩，分别输出成绩最高和成绩最低学生的姓名和学号。输入格式：每个测... </a><div class="article_click rice1" style="width: 240px;float: left;"><p class="operation-b-img operation-b-img-active"><i class="img-up txclick" attc="upclick" attn="0"></i><span class="num"> 赞</span></p><p class="operation-b-img operation-b-img-active"><i class="img-down txclick" attc="downclick" attn="0"></i><span class="num">踩</span></p></div></div><div style="clear: both;"></div></div></li><li><div class="NewTitle"><a title="article" class="cat" href="/article/list/1" target="_blank">article<i></i></a><a title="Kafka生产者详解：实现高效消息发布_kafka 生产消息" href="/w/花生_TL007/article/detail/645152" target="_blank"><em>Kafka</em><em>生产</em>者详解：实现高效<em>消息</em>发布<em>_</em><em>kafka</em> <em>生产</em><em>消息</em>...</a></div><div class="NewsInfo"><div class="NewsDesc" style=""><a title="Kafka生产者详解：实现高效消息发布_kafka 生产消息" href="/w/花生_TL007/article/detail/645152" target="_blank"><em>Kafka</em><em>生产</em>者详解：实现高效<em>消息</em>发布<em>_</em><em>kafka</em> <em>生产</em><em>消息</em><em>kafka</em> <em>生产</em><em>消息</em> ... </a><div class="article_click rice1" style="width: 240px;float: left;"><p class="operation-b-img operation-b-img-active"><i class="img-up txclick" attc="upclick" attn="0"></i><span class="num"> 赞</span></p><p class="operation-b-img operation-b-img-active"><i class="img-down txclick" attc="downclick" attn="0"></i><span class="num">踩</span></p></div></div><div style="clear: both;"></div></div></li><li><div class="NewTitle"><a title="article" class="cat" href="/article/list/1" target="_blank">article<i></i></a><a title="2018年春招实习面试经验总结_每个边界框由 5+b+c 个值组成" href="/w/不正经/article/detail/644432" target="_blank"><em>2018</em>年春招实习<em>面试</em><em>经验总结</em>_<em>每个</em><em>边界</em>框由 5+b+c 个值组成...</a></div><div class="NewsInfo"><div class="NewsDesc" style=""><a title="2018年春招实习面试经验总结_每个边界框由 5+b+c 个值组成" href="/w/不正经/article/detail/644432" target="_blank">本文转自我的个人网站：http://cuijiahua.com/一、前言最近一直在参加各种<em>面试</em>，感觉自己<em>面试</em>表现很弱鸡，... </a><div class="article_click rice1" style="width: 240px;float: left;"><p class="operation-b-img operation-b-img-active"><i class="img-up txclick" attc="upclick" attn="0"></i><span class="num"> 赞</span></p><p class="operation-b-img operation-b-img-active"><i class="img-down txclick" attc="downclick" attn="0"></i><span class="num">踩</span></p></div></div><div style="clear: both;"></div></div></li><li><div class="NewTitle"><a title="article" class="cat" href="/article/list/1" target="_blank">article<i></i></a><a title="AIGC：前沿技术引领内容创新新浪潮_aigc创新发展" href="/w/凡人多烦事01/article/detail/645051" target="_blank"><em>AIGC</em>：<em>前沿技术</em>引领<em>内容</em>创新新浪潮_<em>aigc</em>创新<em>发展</em>...</a></div><div class="NewsInfo"><div class="NewsDesc" style=""><a title="AIGC：前沿技术引领内容创新新浪潮_aigc创新发展" href="/w/凡人多烦事01/article/detail/645051" target="_blank">这些由AI产生的<em>内容</em>可以涵盖广泛的形式，从基本的文字叙述到复杂的多媒体表现，例如长篇报道、短篇小说、诗歌散文、实时新闻稿... </a><div class="article_click rice1" style="width: 240px;float: left;"><p class="operation-b-img operation-b-img-active"><i class="img-up txclick" attc="upclick" attn="0"></i><span class="num"> 赞</span></p><p class="operation-b-img operation-b-img-active"><i class="img-down txclick" attc="downclick" attn="0"></i><span class="num">踩</span></p></div></div><div style="clear: both;"></div></div></li><li><div class="NewTitle"><a title="article" class="cat" href="/article/list/1" target="_blank">article<i></i></a><a title="Python数据类型之元组-字符串_python的元组的元素字符串_python 元组里可以有字符串" href="/w/不正经/article/detail/645449" target="_blank"><em>Python</em><em>数据类型</em>之<em>元组</em>-<em>字符串</em>_<em>python</em><em>的</em><em>元组</em><em>的</em>元素<em>字符串</em>_<em>python</em> <em>元组</em>里<em>可以</em>有<em>字符串</em>...</a></div><div class="NewsInfo"><div class="NewsDesc" style=""><a title="Python数据类型之元组-字符串_python的元组的元素字符串_python 元组里可以有字符串" href="/w/不正经/article/detail/645449" target="_blank"><em>python</em> <em>元组</em>里<em>可以</em>有<em>字符串</em>吗命名<em>元组</em>是<em>元组</em><em>的</em>子类，所以它... </a><div class="article_click rice1" style="width: 240px;float: left;"><p class="operation-b-img operation-b-img-active"><i class="img-up txclick" attc="upclick" attn="0"></i><span class="num"> 赞</span></p><p class="operation-b-img operation-b-img-active"><i class="img-down txclick" attc="downclick" attn="0"></i><span class="num">踩</span></p></div></div><div style="clear: both;"></div></div></li><li><div class="NewTitle"><a title="article" class="cat" href="/article/list/1" target="_blank">article<i></i></a><a title="Python学习笔记 - 探索字符串格式化_{0:0<8s}".format(l[i:i+8])" href="/w/IT小白/article/detail/645452" target="_blank"><em>Python</em>学习笔记 - 探索<em>字符串</em><em>格式化</em>_{<em>0</em><em>:</em><em>0</em><<em>8</em>s}".<em>format</em>(l[<em>i</em><em>:</em><em>i</em>+<em>8</em>])...</a></div><div class="NewsInfo"><div class="NewsDesc" style=""><a title="Python学习笔记 - 探索字符串格式化_{0:0<8s}".format(l[i:i+8])" href="/w/IT小白/article/detail/645452" target="_blank">在<em>Python</em>编程中，函数是重用代码和构建模块化程序的基础。本文深入探讨了如何在<em>Python</em>中定义和使用函数，包括各种参... </a><div class="article_click rice1" style="width: 240px;float: left;"><p class="operation-b-img operation-b-img-active"><i class="img-up txclick" attc="upclick" attn="0"></i><span class="num"> 赞</span></p><p class="operation-b-img operation-b-img-active"><i class="img-down txclick" attc="downclick" attn="0"></i><span class="num">踩</span></p></div></div><div style="clear: both;"></div></div></li></ul><div class="list_tools_top">相关标签</div><div class="list_tools_box"><ul><li><a title="人工智能" rel="nofollow" href="/s?w=人工智能" target="_self">人工智能</a></li><li><a title="深度学习" rel="nofollow" href="/s?w=深度学习" target="_self">深度学习</a></li><li><a title="python" rel="nofollow" href="/s?w=python" target="_self">python</a></li><li><a title="WebMagic" rel="nofollow" href="/s?w=WebMagic" target="_self">WebMagic</a></li><li><a title="Selenium" rel="nofollow" href="/s?w=Selenium" target="_self">Selenium</a></li><li><a title="hadoop" rel="nofollow" href="/s?w=hadoop" target="_self">hadoop</a></li><li><a title="hdfs" rel="nofollow" href="/s?w=hdfs" target="_self">hdfs</a></li><li><a title="架构" rel="nofollow" href="/s?w=架构" target="_self">架构</a></li><li><a title="XILINX" rel="nofollow" href="/s?w=XILINX" target="_self">XILINX</a></li><li><a title="MCAP" rel="nofollow" href="/s?w=MCAP" target="_self">MCAP</a></li><li><a title="PCIE" rel="nofollow" href="/s?w=PCIE" target="_self">PCIE</a></li><li><a title="Partial Reconfiguration" rel="nofollow" href="/s?w=Partial Reconfiguration" target="_self">Partial Reconfiguration</a></li><li><a title="部分重配置" rel="nofollow" href="/s?w=部分重配置" target="_self">部分重配置</a></li><li><a title="信息与通信" rel="nofollow" href="/s?w=信息与通信" target="_self">信息与通信</a></li><li><a title="网络协议" rel="nofollow" href="/s?w=网络协议" target="_self">网络协议</a></li><li><a title="网络安全" rel="nofollow" href="/s?w=网络安全" target="_self">网络安全</a></li><li><a title="MP3播放器" rel="nofollow" href="/s?w=MP3播放器" target="_self">MP3播放器</a></li><li><a title="agi" rel="nofollow" href="/s?w=agi" target="_self">agi</a></li><li><a title="chatgpt" rel="nofollow" href="/s?w=chatgpt" target="_self">chatgpt</a></li><li><a title="语言模型" rel="nofollow" href="/s?w=语言模型" target="_self">语言模型</a></li><li><a title="自然语言处理" rel="nofollow" href="/s?w=自然语言处理" target="_self">自然语言处理</a></li><li><a title="okr" rel="nofollow" href="/s?w=okr" target="_self">okr</a></li><li><a title="big data" rel="nofollow" href="/s?w=big data" target="_self">big data</a></li><li><a title="大数据" rel="nofollow" href="/s?w=大数据" target="_self">大数据</a></li><div style="clear: both;"></div></ul></div><div class="list_tools_top"></div></div></div></div><style type="text/css"></style><link rel="stylesheet" href="https://cdn.wpsshop.cn/public/blog/css/phone.css?v=17352890" type="text/css"><script type="text/javascript"></script></div></div></div></div></div></div><style type="text/css"> /* footer css */ .index006-cover-page-foot { background-color: #F7F7F7; } </style><div class="cppui-row-1_100 cppui-row-view-1 row_1_100 ui-draggable" style="display: block;"><div class="cppui-column-1_100-0-1 column-view-com cppui-column-1_100-0-view-1 ui-sortable"><div class="drag-item-show-view-1 footermsg_view_pic ui-draggable" style="display: block;"><div class="index006-cover-page-foot drag-item-hide-view-1"><p class="copyright">Copyright © 2003-2013 www.wpsshop.cn 版权所有，并保留所有权利。 </p><div style="background-color:#F7F7F7; text-align:center; height:20px;padding-top:5px;"><a target="_blank" href="#" style="display:inline-block;text-decoration:none;height:20px;line-height:20px;"><img src="https://cdnimages.wpsshop.cn/57public/skin/index/default/ui/images/beian_ghs.png" style="float:left;"> <p style="float:left;height:20px;line-height:20px;margin: 0px 0px 0px 5px; color:#939393;">闽ICP备14008679号</p></a> <a href="https://www.wpsshop.cn/xml/w/%E7%AC%94%E8%A7%A6%E7%8B%82%E6%94%BE9/article/detail/644826.xml" target="_blank" style="display:inline-block;text-decoration:none;height:20px;line-height:20px;"><img src="https://cdn.wpsshop.cn/public/blog/images/site.png" style="float:left;"></a> <a href="/xml/w/g007/article/detail/new.xml" target="_blank" style="display:inline-block;text-decoration:none;height:20px;line-height:20px;"><img src="https://cdn.wpsshop.cn/public/blog/images/site.png" style="float:left;"></a> <a href="/site.xml" target="_blank" style="display:inline-block;text-decoration:none;height:20px;line-height:20px;"><img src="https://cdn.wpsshop.cn/public/blog/images/site.png" style="float:left;"></a></div></div></div></div></div><script type="text/javascript">var domain = document.domain;var hr=encodeURIComponent(window.location.href+'=='+document.referrer); document.write('<script src="https://ad.wpsshop.cn/admin.appflux?s=ad_flu_ind&fluxuserauto=yes&hr='+hr+'&p57weburl='+domain+'&p57usercode1='+domain+'&u=Vy1RJQhqAXUEMQNnAm0HaVVu&i='+p57ref("id")+'&r='+escape(document.referrer)+'" language="JavaScript"><\/script>');function p57ref(id){var reg=new RegExp("(^|&)"+id+"=([^&]*)(&|$)");var ref=window.location.search.substr(1).match(reg);if(ref!=null)return unescape(ref[2]);return null;} </script></body></html>