Site updated: 2025-03-14 15:10:13

Author: simuleite

ComputerScience/基本操作/git使用/index.html

@@ -20,15 +20,15 @@
 
 <script class="next-config" data-name="main" type="application/json">{"hostname":"simuleite.github.io","root":"/","images":"/images","scheme":"Muse","darkmode":false,"version":"8.21.0","exturl":false,"sidebar":{"position":"left","width_expanded":320,"width_dual_column":240,"display":"post","padding":18,"offset":12},"hljswrap":true,"copycode":{"enable":false,"style":null},"fold":{"enable":false,"height":500},"bookmark":{"enable":false,"color":"#222","save":"auto"},"mediumzoom":false,"lazyload":false,"pangu":false,"comments":{"style":"tabs","active":null,"storage":true,"lazyload":false,"nav":null},"stickytabs":false,"motion":{"enable":true,"async":false,"transition":{"menu_item":"fadeInDown","post_block":"fadeIn","post_header":"fadeInDown","post_body":"fadeInDown","coll_header":"fadeInLeft","sidebar":"fadeInUp"}},"i18n":{"placeholder":"搜索...","empty":"没有找到任何搜索结果：${query}","hits_time":"找到 ${hits} 个搜索结果（用时 ${time} 毫秒）","hits":"找到 ${hits} 个搜索结果"},"path":"/search.xml","localsearch":{"enable":true,"top_n_per_article":1,"unescape":false,"preload":false}}</script><script src="/js/config.js"></script>
 
-    <meta name="description" content="0.0 代码合并流程  在各自的分支self上进行开发 切换到develop分支，git pull --rebase同步最新代码   不要使用Git Pull git pull会创建一个新的merge commit，这样提交历史不是一条清晰的线，包含无意义的分支合并，非常混乱。 而git pull --rebase会解决这个问题，这个命令首先把你的commit放到一变，拉取最新分支状态，最后为你">
+    <meta name="description" content="0.0 代码合并流程  在各自的分支self上进行开发 切换到develop分支，git pull --rebase同步最新代码   不要使用Git Pull git pull会创建一个新的merge commit，这样提交历史不是一条清晰的线，包含无意义的分支合并，非常混乱。 而git pull --rebase会解决这个问题，这个命令首先把你的commit放到一边，拉取最新分支状态，最后为你">
 <meta property="og:type" content="article">
 <meta property="og:title" content="git使用">
 <meta property="og:url" content="http://simuleite.github.io/ComputerScience/%E5%9F%BA%E6%9C%AC%E6%93%8D%E4%BD%9C/git%E4%BD%BF%E7%94%A8/index.html">
 <meta property="og:site_name" content="SMULET&#39;s BLOG">
-<meta property="og:description" content="0.0 代码合并流程  在各自的分支self上进行开发 切换到develop分支，git pull --rebase同步最新代码   不要使用Git Pull git pull会创建一个新的merge commit，这样提交历史不是一条清晰的线，包含无意义的分支合并，非常混乱。 而git pull --rebase会解决这个问题，这个命令首先把你的commit放到一变，拉取最新分支状态，最后为你">
+<meta property="og:description" content="0.0 代码合并流程  在各自的分支self上进行开发 切换到develop分支，git pull --rebase同步最新代码   不要使用Git Pull git pull会创建一个新的merge commit，这样提交历史不是一条清晰的线，包含无意义的分支合并，非常混乱。 而git pull --rebase会解决这个问题，这个命令首先把你的commit放到一边，拉取最新分支状态，最后为你">
 <meta property="og:locale" content="zh_CN">
 <meta property="article:published_time" content="2023-11-08T16:00:00.000Z">
-<meta property="article:modified_time" content="2025-03-09T07:13:40.299Z">
+<meta property="article:modified_time" content="2025-03-13T02:56:18.414Z">
 <meta property="article:author" content="SIMULEITE">
 <meta property="article:tag" content="基本操作">
 <meta name="twitter:card" content="summary">
@@ -223,7 +223,7 @@ <h1 class="post-title" itemprop="name headline">
         <i class="far fa-calendar-check"></i>
       </span>
       <span class="post-meta-item-text">更新于</span>
-      <time title="修改时间：2025-03-09 15:13:40" itemprop="dateModified" datetime="2025-03-09T15:13:40+08:00">2025-03-09</time>
+      <time title="修改时间：2025-03-13 10:56:18" itemprop="dateModified" datetime="2025-03-13T10:56:18+08:00">2025-03-13</time>
     </span>
 
 
@@ -243,7 +243,7 @@ <h1 class="post-title" itemprop="name headline">
 <blockquote>
 <p>不要使用Git Pull<br />
 <code>git pull</code>会创建一个新的<code>merge commit</code>，这样提交历史不是一条清晰的线，包含无意义的分支合并，非常混乱。<br />
-而<code>git pull --rebase</code>会解决这个问题，这个命令首先把你的<code>commit</code>放到一变，拉取最新分支状态，最后为你自动变基到最新状态。<br />
+而<code>git pull --rebase</code>会解决这个问题，这个命令首先把你的<code>commit</code>放到一边，拉取最新分支状态，最后为你自动变基到最新状态。<br />
 如果遇到合并冲突，使用<code>git rebase --abort</code>撤回<code>rebase</code>，然后使用<code>git pull</code>或者使用交互式变基。</p>
 </blockquote>
 <ol start="3">

ComputerScience/指南/Markdown模板/index.html

@@ -28,7 +28,7 @@
 <meta property="og:description" content="一号标题  Title 2  三号标题  Title 4  五号标题  Title 6     标题 Title 标题     左对齐 Justify Align 右对齐     无序列表  Unordered List     有序列表 2. Ordered List   [x] 待办事项 [] TO-DO List  Delete Line Blod Italic Code E&#x3D;MC2E &#x3D;">
 <meta property="og:locale" content="zh_CN">
 <meta property="article:published_time" content="2023-11-09T16:00:00.000Z">
-<meta property="article:modified_time" content="2025-03-01T12:29:59.456Z">
+<meta property="article:modified_time" content="2025-03-14T01:58:28.667Z">
 <meta property="article:author" content="SIMULEITE">
 <meta property="article:tag" content="指南">
 <meta name="twitter:card" content="summary">
@@ -223,7 +223,7 @@ <h1 class="post-title" itemprop="name headline">
         <i class="far fa-calendar-check"></i>
       </span>
       <span class="post-meta-item-text">更新于</span>
-      <time title="修改时间：2025-03-01 20:29:59" itemprop="dateModified" datetime="2025-03-01T20:29:59+08:00">2025-03-01</time>
+      <time title="修改时间：2025-03-14 09:58:28" itemprop="dateModified" datetime="2025-03-14T09:58:28+08:00">2025-03-14</time>
     </span>
 
 
@@ -279,7 +279,7 @@ <h6 id="title-6"><a class="markdownIt-Anchor" href="#title-6"></a> Title 6</h6>
 <code>Code</code><br />
 <span class="katex"><span class="katex-mathml"><math><semantics><mrow><mi>E</mi><mo>=</mo><mi>M</mi><msup><mi>C</mi><mn>2</mn></msup></mrow><annotation encoding="application/x-tex">E = MC^2</annotation></semantics></math></span><span class="katex-html" aria-hidden="true"><span class="base"><span class="strut" style="height:0.68333em;vertical-align:0em;"></span><span class="mord mathdefault" style="margin-right:0.05764em;">E</span><span class="mspace" style="margin-right:0.2777777777777778em;"></span><span class="mrel">=</span><span class="mspace" style="margin-right:0.2777777777777778em;"></span></span><span class="base"><span class="strut" style="height:0.8141079999999999em;vertical-align:0em;"></span><span class="mord mathdefault" style="margin-right:0.10903em;">M</span><span class="mord"><span class="mord mathdefault" style="margin-right:0.07153em;">C</span><span class="msupsub"><span class="vlist-t"><span class="vlist-r"><span class="vlist" style="height:0.8141079999999999em;"><span style="top:-3.063em;margin-right:0.05em;"><span class="pstrut" style="height:2.7em;"></span><span class="sizing reset-size6 size3 mtight"><span class="mord mtight">2</span></span></span></span></span></span></span></span></span></span></span><br />
 <a href="#">Link</a></p>
-<p><sup class="footnote-ref"><a href="#fn1" id="fnref1">[1]</a></sup>Hello, World!</p>
+<p><sup class="footnote-ref"><a href="#fn1" id="fnref1">[1]</a></sup>Hello, World!<sup class="footnote-ref"><a href="#fn2" id="fnref2">[2]</a></sup></p>
 <figure class="highlight java"><table><tr><td class="code"><pre><span class="line"><span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">void</span> <span class="title function_">main</span><span class="params">(String[] args)</span> &#123;</span><br><span class="line">    System.out.println(<span class="string">&quot;Hello World!&quot;</span>);</span><br><span class="line">&#125;</span><br></pre></td></tr></table></figure>
 <figure class="highlight diff"><table><tr><td class="code"><pre><span class="line"><span class="comment">--- auto_detect: ture</span></span><br><span class="line"><span class="comment">+++ auto_detect: false</span></span><br></pre></td></tr></table></figure>
 <blockquote>
@@ -313,6 +313,8 @@ <h6 id="title-6"><a class="markdownIt-Anchor" href="#title-6"></a> Title 6</h6>
 <ol class="footnotes-list">
 <li id="fn1" class="footnote-item"><p>Hello World! <a href="#fnref1" class="footnote-backref">↩︎</a></p>
 </li>
+<li id="fn2" class="footnote-item"><p>Footnote <a href="#fnref2" class="footnote-backref">↩︎</a></p>
+</li>
 </ol>
 </section>