ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

Deployed 79b326d to prerelease with MkDocs 1.6.0 and mike 2.1.1

Browse source
This commit is contained in:
jj-docs[bot] 2024-07-17 06:11:09 +00:00
parent 32b461ec50
commit 575d8b5d7d
4 changed files with 40 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
prerelease/search/search_index.json
View file

File diff suppressed because one or more lines are too long

70
prerelease/sitemap.xml
View file

@ -2,177 +2,177 @@
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"> <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/</loc> <loc>https://martinvonz.github.io/jj/latest/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/FAQ/</loc> <loc>https://martinvonz.github.io/jj/latest/FAQ/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/branches/</loc> <loc>https://martinvonz.github.io/jj/latest/branches/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/cli-reference/</loc> <loc>https://martinvonz.github.io/jj/latest/cli-reference/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/code-of-conduct/</loc> <loc>https://martinvonz.github.io/jj/latest/code-of-conduct/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/community_tools/</loc> <loc>https://martinvonz.github.io/jj/latest/community_tools/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/config/</loc> <loc>https://martinvonz.github.io/jj/latest/config/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/conflicts/</loc> <loc>https://martinvonz.github.io/jj/latest/conflicts/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/contributing/</loc> <loc>https://martinvonz.github.io/jj/latest/contributing/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/design_doc_blueprint/</loc> <loc>https://martinvonz.github.io/jj/latest/design_doc_blueprint/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/design_docs/</loc> <loc>https://martinvonz.github.io/jj/latest/design_docs/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/filesets/</loc> <loc>https://martinvonz.github.io/jj/latest/filesets/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/git-comparison/</loc> <loc>https://martinvonz.github.io/jj/latest/git-comparison/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/git-compatibility/</loc> <loc>https://martinvonz.github.io/jj/latest/git-compatibility/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/github/</loc> <loc>https://martinvonz.github.io/jj/latest/github/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/glossary/</loc> <loc>https://martinvonz.github.io/jj/latest/glossary/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/install-and-setup/</loc> <loc>https://martinvonz.github.io/jj/latest/install-and-setup/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/operation-log/</loc> <loc>https://martinvonz.github.io/jj/latest/operation-log/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/related-work/</loc> <loc>https://martinvonz.github.io/jj/latest/related-work/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/revsets/</loc> <loc>https://martinvonz.github.io/jj/latest/revsets/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/sapling-comparison/</loc> <loc>https://martinvonz.github.io/jj/latest/sapling-comparison/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/templates/</loc> <loc>https://martinvonz.github.io/jj/latest/templates/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/testimonials/</loc> <loc>https://martinvonz.github.io/jj/latest/testimonials/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/tutorial/</loc> <loc>https://martinvonz.github.io/jj/latest/tutorial/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/windows/</loc> <loc>https://martinvonz.github.io/jj/latest/windows/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/working-copy/</loc> <loc>https://martinvonz.github.io/jj/latest/working-copy/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/design/copy-tracking/</loc> <loc>https://martinvonz.github.io/jj/latest/design/copy-tracking/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/design/git-submodule-storage/</loc> <loc>https://martinvonz.github.io/jj/latest/design/git-submodule-storage/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/design/git-submodules/</loc> <loc>https://martinvonz.github.io/jj/latest/design/git-submodules/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/design/run/</loc> <loc>https://martinvonz.github.io/jj/latest/design/run/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/design/sparse-v2/</loc> <loc>https://martinvonz.github.io/jj/latest/design/sparse-v2/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/design/tracking-branches/</loc> <loc>https://martinvonz.github.io/jj/latest/design/tracking-branches/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/technical/architecture/</loc> <loc>https://martinvonz.github.io/jj/latest/technical/architecture/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/technical/concurrency/</loc> <loc>https://martinvonz.github.io/jj/latest/technical/concurrency/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
<url> <url>
<loc>https://martinvonz.github.io/jj/latest/technical/conflicts/</loc> <loc>https://martinvonz.github.io/jj/latest/technical/conflicts/</loc>
<lastmod>2024-07-16</lastmod> <lastmod>2024-07-17</lastmod>
<changefreq>daily</changefreq> <changefreq>daily</changefreq>
</url> </url>
</urlset> </urlset>

BIN
prerelease/sitemap.xml.gz
View file

Binary file not shown.

8
prerelease/tutorial/index.html
View file

@ -1538,7 +1538,7 @@ working copy. Any further changes in the working copy will then amend the
commit. Whether you choose to create a new change and squash, or to edit, commit. Whether you choose to create a new change and squash, or to edit,
typically depends on how done you are with the change; if the change is almost typically depends on how done you are with the change; if the change is almost
done, it makes sense to use <code>jj new</code> so you can easily review your adjustments done, it makes sense to use <code>jj new</code> so you can easily review your adjustments
with <code>jj diff</code> before running <code>jj squash</code>. </p> with <code>jj diff</code> before running <code>jj squash</code>.</p>
<p>To view how a change has evolved over time, we can use <code>jj obslog</code> to see each <p>To view how a change has evolved over time, we can use <code>jj obslog</code> to see each
recorded change for the current commit. This records changes to the working recorded change for the current commit. This records changes to the working
copy, message, squashes, rebases, etc.</p> copy, message, squashes, rebases, etc.</p>
@ -1636,7 +1636,7 @@ New<span class="w"> </span>conflicts<span class="w"> </span>appeared<span class=
To<span class="w"> </span>resolve<span class="w"> </span>the<span class="w"> </span>conflicts,<span class="w"> </span>start<span class="w"> </span>by<span class="w"> </span>updating<span class="w"> </span>to<span class="w"> </span>the<span class="w"> </span>first<span class="w"> </span>one: To<span class="w"> </span>resolve<span class="w"> </span>the<span class="w"> </span>conflicts,<span class="w"> </span>start<span class="w"> </span>by<span class="w"> </span>updating<span class="w"> </span>to<span class="w"> </span>the<span class="w"> </span>first<span class="w"> </span>one:
<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>puqltuttzvly <span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>puqltuttzvly
Then<span class="w"> </span>use<span class="w"> </span><span class="sb">`</span>jj<span class="w"> </span>resolve<span class="sb">`</span>,<span class="w"> </span>or<span class="w"> </span>edit<span class="w"> </span>the<span class="w"> </span>conflict<span class="w"> </span>markers<span class="w"> </span><span class="k">in</span><span class="w"> </span>the<span class="w"> </span>file<span class="w"> </span>directly. Then<span class="w"> </span>use<span class="w"> </span><span class="sb">`</span>jj<span class="w"> </span>resolve<span class="sb">`</span>,<span class="w"> </span>or<span class="w"> </span>edit<span class="w"> </span>the<span class="w"> </span>conflict<span class="w"> </span>markers<span class="w"> </span><span class="k">in</span><span class="w"> </span>the<span class="w"> </span>file<span class="w"> </span>directly.
Once<span class="w"> </span>the<span class="w"> </span>conflicts<span class="w"> </span>are<span class="w"> </span>resolved,<span class="w"> </span>you<span class="w"> </span>may<span class="w"> </span>want<span class="w"> </span>inspect<span class="w"> </span>the<span class="w"> </span>result<span class="w"> </span>with<span class="w"> </span><span class="sb">`</span>jj<span class="w"> </span>diff<span class="sb">`</span>. Once<span class="w"> </span>the<span class="w"> </span>conflicts<span class="w"> </span>are<span class="w"> </span>resolved,<span class="w"> </span>you<span class="w"> </span>may<span class="w"> </span>want<span class="w"> </span>to<span class="w"> </span>inspect<span class="w"> </span>the<span class="w"> </span>result<span class="w"> </span>with<span class="w"> </span><span class="sb">`</span>jj<span class="w"> </span>diff<span class="sb">`</span>.
Then<span class="w"> </span>run<span class="w"> </span><span class="sb">`</span>jj<span class="w"> </span>squash<span class="sb">`</span><span class="w"> </span>to<span class="w"> </span>move<span class="w"> </span>the<span class="w"> </span>resolution<span class="w"> </span>into<span class="w"> </span>the<span class="w"> </span>conflicted<span class="w"> </span>commit. Then<span class="w"> </span>run<span class="w"> </span><span class="sb">`</span>jj<span class="w"> </span>squash<span class="sb">`</span><span class="w"> </span>to<span class="w"> </span>move<span class="w"> </span>the<span class="w"> </span>resolution<span class="w"> </span>into<span class="w"> </span>the<span class="w"> </span>conflicted<span class="w"> </span>commit.
Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>qzvqqupx<span class="w"> </span>1978b534<span class="w"> </span><span class="o">(</span>conflict<span class="o">)</span><span class="w"> </span>C Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>qzvqqupx<span class="w"> </span>1978b534<span class="w"> </span><span class="o">(</span>conflict<span class="o">)</span><span class="w"> </span>C
Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>puqltutt<span class="w"> </span>f7fb5943<span class="w"> </span><span class="o">(</span>conflict<span class="o">)</span><span class="w"> </span>B2 Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>puqltutt<span class="w"> </span>f7fb5943<span class="w"> </span><span class="o">(</span>conflict<span class="o">)</span><span class="w"> </span>B2
@ -1750,7 +1750,7 @@ New<span class="w"> </span>conflicts<span class="w"> </span>appeared<span class=
To<span class="w"> </span>resolve<span class="w"> </span>the<span class="w"> </span>conflicts,<span class="w"> </span>start<span class="w"> </span>by<span class="w"> </span>updating<span class="w"> </span>to<span class="w"> </span>the<span class="w"> </span>first<span class="w"> </span>one: To<span class="w"> </span>resolve<span class="w"> </span>the<span class="w"> </span>conflicts,<span class="w"> </span>start<span class="w"> </span>by<span class="w"> </span>updating<span class="w"> </span>to<span class="w"> </span>the<span class="w"> </span>first<span class="w"> </span>one:
<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>puqltuttzvly <span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>puqltuttzvly
Then<span class="w"> </span>use<span class="w"> </span><span class="sb">`</span>jj<span class="w"> </span>resolve<span class="sb">`</span>,<span class="w"> </span>or<span class="w"> </span>edit<span class="w"> </span>the<span class="w"> </span>conflict<span class="w"> </span>markers<span class="w"> </span><span class="k">in</span><span class="w"> </span>the<span class="w"> </span>file<span class="w"> </span>directly. Then<span class="w"> </span>use<span class="w"> </span><span class="sb">`</span>jj<span class="w"> </span>resolve<span class="sb">`</span>,<span class="w"> </span>or<span class="w"> </span>edit<span class="w"> </span>the<span class="w"> </span>conflict<span class="w"> </span>markers<span class="w"> </span><span class="k">in</span><span class="w"> </span>the<span class="w"> </span>file<span class="w"> </span>directly.
Once<span class="w"> </span>the<span class="w"> </span>conflicts<span class="w"> </span>are<span class="w"> </span>resolved,<span class="w"> </span>you<span class="w"> </span>may<span class="w"> </span>want<span class="w"> </span>inspect<span class="w"> </span>the<span class="w"> </span>result<span class="w"> </span>with<span class="w"> </span><span class="sb">`</span>jj<span class="w"> </span>diff<span class="sb">`</span>. Once<span class="w"> </span>the<span class="w"> </span>conflicts<span class="w"> </span>are<span class="w"> </span>resolved,<span class="w"> </span>you<span class="w"> </span>may<span class="w"> </span>want<span class="w"> </span>to<span class="w"> </span>inspect<span class="w"> </span>the<span class="w"> </span>result<span class="w"> </span>with<span class="w"> </span><span class="sb">`</span>jj<span class="w"> </span>diff<span class="sb">`</span>.
Then<span class="w"> </span>run<span class="w"> </span><span class="sb">`</span>jj<span class="w"> </span>squash<span class="sb">`</span><span class="w"> </span>to<span class="w"> </span>move<span class="w"> </span>the<span class="w"> </span>resolution<span class="w"> </span>into<span class="w"> </span>the<span class="w"> </span>conflicted<span class="w"> </span>commit. Then<span class="w"> </span>run<span class="w"> </span><span class="sb">`</span>jj<span class="w"> </span>squash<span class="sb">`</span><span class="w"> </span>to<span class="w"> </span>move<span class="w"> </span>the<span class="w"> </span>resolution<span class="w"> </span>into<span class="w"> </span>the<span class="w"> </span>conflicted<span class="w"> </span>commit.
Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>zxoosnnp<span class="w"> </span>63874fe6<span class="w"> </span><span class="o">(</span>no<span class="w"> </span>description<span class="w"> </span><span class="nb">set</span><span class="o">)</span> Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>zxoosnnp<span class="w"> </span>63874fe6<span class="w"> </span><span class="o">(</span>no<span class="w"> </span>description<span class="w"> </span><span class="nb">set</span><span class="o">)</span>
Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>puqltutt<span class="w"> </span>f7fb5943<span class="w"> </span><span class="o">(</span>conflict<span class="o">)</span><span class="w"> </span>B2 Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>puqltutt<span class="w"> </span>f7fb5943<span class="w"> </span><span class="o">(</span>conflict<span class="o">)</span><span class="w"> </span>B2
@ -1850,7 +1850,7 @@ New<span class="w"> </span>conflicts<span class="w"> </span>appeared<span class=
To<span class="w"> </span>resolve<span class="w"> </span>the<span class="w"> </span>conflicts,<span class="w"> </span>start<span class="w"> </span>by<span class="w"> </span>updating<span class="w"> </span>to<span class="w"> </span>it: To<span class="w"> </span>resolve<span class="w"> </span>the<span class="w"> </span>conflicts,<span class="w"> </span>start<span class="w"> </span>by<span class="w"> </span>updating<span class="w"> </span>to<span class="w"> </span>it:
<span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>mrxqplykmyqv <span class="w"> </span>jj<span class="w"> </span>new<span class="w"> </span>mrxqplykmyqv
Then<span class="w"> </span>use<span class="w"> </span><span class="sb">`</span>jj<span class="w"> </span>resolve<span class="sb">`</span>,<span class="w"> </span>or<span class="w"> </span>edit<span class="w"> </span>the<span class="w"> </span>conflict<span class="w"> </span>markers<span class="w"> </span><span class="k">in</span><span class="w"> </span>the<span class="w"> </span>file<span class="w"> </span>directly. Then<span class="w"> </span>use<span class="w"> </span><span class="sb">`</span>jj<span class="w"> </span>resolve<span class="sb">`</span>,<span class="w"> </span>or<span class="w"> </span>edit<span class="w"> </span>the<span class="w"> </span>conflict<span class="w"> </span>markers<span class="w"> </span><span class="k">in</span><span class="w"> </span>the<span class="w"> </span>file<span class="w"> </span>directly.
Once<span class="w"> </span>the<span class="w"> </span>conflicts<span class="w"> </span>are<span class="w"> </span>resolved,<span class="w"> </span>you<span class="w"> </span>may<span class="w"> </span>want<span class="w"> </span>inspect<span class="w"> </span>the<span class="w"> </span>result<span class="w"> </span>with<span class="w"> </span><span class="sb">`</span>jj<span class="w"> </span>diff<span class="sb">`</span>. Once<span class="w"> </span>the<span class="w"> </span>conflicts<span class="w"> </span>are<span class="w"> </span>resolved,<span class="w"> </span>you<span class="w"> </span>may<span class="w"> </span>want<span class="w"> </span>to<span class="w"> </span>inspect<span class="w"> </span>the<span class="w"> </span>result<span class="w"> </span>with<span class="w"> </span><span class="sb">`</span>jj<span class="w"> </span>diff<span class="sb">`</span>.
Then<span class="w"> </span>run<span class="w"> </span><span class="sb">`</span>jj<span class="w"> </span>squash<span class="sb">`</span><span class="w"> </span>to<span class="w"> </span>move<span class="w"> </span>the<span class="w"> </span>resolution<span class="w"> </span>into<span class="w"> </span>the<span class="w"> </span>conflicted<span class="w"> </span>commit. Then<span class="w"> </span>run<span class="w"> </span><span class="sb">`</span>jj<span class="w"> </span>squash<span class="sb">`</span><span class="w"> </span>to<span class="w"> </span>move<span class="w"> </span>the<span class="w"> </span>resolution<span class="w"> </span>into<span class="w"> </span>the<span class="w"> </span>conflicted<span class="w"> </span>commit.
Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>mrxqplyk<span class="w"> </span>1c72cd50<span class="w"> </span><span class="o">(</span>conflict<span class="o">)</span><span class="w"> </span>ABCD Working<span class="w"> </span>copy<span class="w"> </span>now<span class="w"> </span>at:<span class="w"> </span>mrxqplyk<span class="w"> </span>1c72cd50<span class="w"> </span><span class="o">(</span>conflict<span class="o">)</span><span class="w"> </span>ABCD
Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>kwtuwqnm<span class="w"> </span>70985eaa<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>ABC Parent<span class="w"> </span>commit<span class="w"> </span>:<span class="w"> </span>kwtuwqnm<span class="w"> </span>70985eaa<span class="w"> </span><span class="o">(</span>empty<span class="o">)</span><span class="w"> </span>ABC