cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-28 18:41:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deployed 417f19d to prerelease with MkDocs 1.6.0 and mike 2.1.1

Browse Source
This commit is contained in:
jj-docs[bot] 2024-08-06 01:23:38 +00:00
parent b93b565866
commit 260231f2eb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
prerelease/branches/index.html
View File

@ -1705,9 +1705,9 @@ have conflicts. Both can end up in that state if concurrent operations were run
in the repo. The local branch more typically becomes conflicted because it was in the repo. The local branch more typically becomes conflicted because it was
updated both locally and on a remote.</p> updated both locally and on a remote.</p>
<p>To resolve a conflicted state in a local branch (e.g. <code>main</code>), you can move the <p>To resolve a conflicted state in a local branch (e.g. <code>main</code>), you can move the
branch to the desired target with <code>jj branch</code>. You may want to first either branch to the desired target with <code>jj branch move</code>. You may want to first either
merge the conflicted targets with <code>jj merge</code>, or you may want to rebase one side merge the conflicted targets with <code>jj new</code> (e.g. <code>jj new 'all:main'</code>), or you may
on top of the other with <code>jj rebase</code>.</p> want to rebase one side on top of the other with <code>jj rebase</code>.</p>
<p>To resolve a conflicted state in a remote branch (e.g. <code>main@origin</code>), simply <p>To resolve a conflicted state in a remote branch (e.g. <code>main@origin</code>), simply
pull from the remote (e.g. <code>jj git fetch</code>). The conflict resolution will also pull from the remote (e.g. <code>jj git fetch</code>). The conflict resolution will also
propagate to the local branch (which was presumably also conflicted).</p> propagate to the local branch (which was presumably also conflicted).</p>

2
prerelease/search/search_index.json
View File

File diff suppressed because one or more lines are too long