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

Deployed 8e0ac1d to prerelease with MkDocs 1.6.0 and mike 2.1.1

Browse Source
This commit is contained in:
jj-docs[bot] 2024-05-17 14:00:46 +00:00
parent 52b47094d8
commit 5c49b6a097
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
prerelease/branches/index.html
View File

@ -1561,10 +1561,10 @@ current branch commit, even if it isn't entirely accurate.</p>
<p>Branches can end up in a conflicted state. When that happens, <code>jj status</code> will
include information about the conflicted branches (and instructions for how to
mitigate it). <code>jj branch list</code> will have details. <code>jj log</code> will show the branch
name with a question mark suffix (e.g. <code>main?</code>) on each of the conflicted
branch's potential target revisions. Using the branch name to look up a revision
will resolve to all potential targets. That means that <code>jj new main</code> will error
out, complaining that the revset resolved to multiple revisions.</p>
name with a double question mark suffix (e.g. <code>main??</code>) on each of the
conflicted branch's potential target revisions. Using the branch name to look up
a revision will resolve to all potential targets. That means that <code>jj new main</code>
will error out, complaining that the revset resolved to multiple revisions.</p>
<p>Both local branches (e.g. <code>main</code>) and the remote branch (e.g. <code>main@origin</code>) can
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

2
prerelease/search/search_index.json
View File

File diff suppressed because one or more lines are too long