astronit/oakazanin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: форматирование, опечатка в статье

Browse Source
This commit is contained in:
Олег Казанин
2026-02-23 12:27:32 +00:00
parent 2860cf8374
commit 07141970c9
133 changed files with 17036 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/cheatsheets/git-workflow/index.html
+42 -4
View File
@@ -1155,8 +1155,13 @@
<div class="highlight-wrapper"><div class="highlight"><pre tabindex="0" class="chroma"><code class="language-text" data-lang="text"><span class="line"><span class="cl">~/projects/blog/ ← одна папка, две ветки
</span></span><span class="line"><span class="cl"> ├── main ← production (blog.ru)
</span></span><span class="line"><span class="cl"> └── dev ← development (dev.blog.ru)</span></span></code></pre></div></div>
<p><strong>Принцип:</strong> Одна папка, две ветки. Переключение через <code>git checkout</code>, не через разные директории.</p>
<hr>
<div class="admonition relative overflow-hidden rounded-lg border-l-4 my-3 px-4 py-3 shadow-sm" data-type="important">
<div class="flex items-center gap-2 font-semibold text-inherit">
<div class="flex shrink-0 h-5 w-5 items-center justify-center text-lg"><span class="relative block icon"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path fill="currentColor" d="M287.9 0C297.1 0 305.5 5.25 309.5 13.52L378.1 154.8L531.4 177.5C540.4 178.8 547.8 185.1 550.7 193.7C553.5 202.4 551.2 211.9 544.8 218.2L433.6 328.4L459.9 483.9C461.4 492.9 457.7 502.1 450.2 507.4C442.8 512.7 432.1 513.4 424.9 509.1L287.9 435.9L150.1 509.1C142.9 513.4 133.1 512.7 125.6 507.4C118.2 502.1 114.5 492.9 115.1 483.9L142.2 328.4L31.11 218.2C24.65 211.9 22.36 202.4 25.2 193.7C28.03 185.1 35.5 178.8 44.49 177.5L197.7 154.8L266.3 13.52C270.4 5.249 278.7 0 287.9 0L287.9 0zM287.9 78.95L235.4 187.2C231.9 194.3 225.1 199.3 217.3 200.5L98.98 217.9L184.9 303C190.4 308.5 192.9 316.4 191.6 324.1L171.4 443.7L276.6 387.5C283.7 383.7 292.2 383.7 299.2 387.5L404.4 443.7L384.2 324.1C382.9 316.4 385.5 308.5 391 303L476.9 217.9L358.6 200.5C350.7 199.3 343.9 194.3 340.5 187.2L287.9 78.95z"/></svg></span></div>
<div class="grow">
<strong>Принцип:</strong> Одна папка, две ветки. Переключение через <code>git checkout</code>, не через разные директории.
</div>
</div></div><hr>
<h2 class="relative group">Золотые правила
<div id="золотые-правила" class="anchor"></div>
@@ -1618,8 +1623,13 @@
</span></span><span class="line"><span class="cl">git merge dev --no-edit
</span></span><span class="line"><span class="cl">git push origin main</span></span></code></pre></div></div>
<hr>
<p><strong>Помни:</strong> Dev для экспериментов, main для проверенного контента. Всегда тестируй перед публикацией.</p>
<div class="admonition relative overflow-hidden rounded-lg border-l-4 my-3 px-4 py-3 shadow-sm" data-type="important">
<div class="flex items-center gap-2 font-semibold text-inherit">
<div class="flex shrink-0 h-5 w-5 items-center justify-center text-lg"><span class="relative block icon"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path fill="currentColor" d="M287.9 0C297.1 0 305.5 5.25 309.5 13.52L378.1 154.8L531.4 177.5C540.4 178.8 547.8 185.1 550.7 193.7C553.5 202.4 551.2 211.9 544.8 218.2L433.6 328.4L459.9 483.9C461.4 492.9 457.7 502.1 450.2 507.4C442.8 512.7 432.1 513.4 424.9 509.1L287.9 435.9L150.1 509.1C142.9 513.4 133.1 512.7 125.6 507.4C118.2 502.1 114.5 492.9 115.1 483.9L142.2 328.4L31.11 218.2C24.65 211.9 22.36 202.4 25.2 193.7C28.03 185.1 35.5 178.8 44.49 177.5L197.7 154.8L266.3 13.52C270.4 5.249 278.7 0 287.9 0L287.9 0zM287.9 78.95L235.4 187.2C231.9 194.3 225.1 199.3 217.3 200.5L98.98 217.9L184.9 303C190.4 308.5 192.9 316.4 191.6 324.1L171.4 443.7L276.6 387.5C283.7 383.7 292.2 383.7 299.2 387.5L404.4 443.7L384.2 324.1C382.9 316.4 385.5 308.5 391 303L476.9 217.9L358.6 200.5C350.7 199.3 343.9 194.3 340.5 187.2L287.9 78.95z"/></svg></span></div>
<div class="grow">
<strong>Важно:</strong> <code>Dev</code> для экспериментов, <code>main</code> для проверенного контента. Всегда тестируй перед публикацией.
</div>
</div></div>
@@ -3282,6 +3292,34 @@
<footer class="pt-8 max-w-prose print:hidden">
<div class="pt-8">
<hr class="border-dotted border-neutral-300 dark:border-neutral-600">
<div class="flex justify-between pt-3">
<span class="flex flex-col">
</span>
<span class="flex flex-col items-end">
<a
class="flex text-right text-neutral-700 hover:text-primary-600 dark:text-neutral dark:hover:text-primary-400"
href="/cheatsheets/shortcodes/">
<span class="leading-6">
Shortcodes&ensp;<span class="inline-block rtl:rotate-180">&rarr;</span>
</span>
</a>
<span class="me-6 mt-1 text-xs text-neutral-500 dark:text-neutral-400">
<time datetime="0001-01-01T00:00:00&#43;00:00">1 января 0001</time>
</span>
</span>
</div>
</div>