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

docs: conflicted branches have two "?" as suffix

Browse source 
Looks like we forgot to update this when we changed from one to two
question marks.
This commit is contained in:
Martin von Zweigbergk 2024-05-17 06:11:44 -07:00 committed by Martin von Zweigbergk
parent 0a48ac63cb
commit 8e0ac1d167
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
docs/branches.md
View file

@ -157,10 +157,10 @@ current branch commit, even if it isn't entirely accurate.
Branches can end up in a conflicted state. When that happens, `jj status` will
include information about the conflicted branches (and instructions for how to
mitigate it). `jj branch list` will have details. `jj log` will show the branch
name with a question mark suffix (e.g. `main?`) 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 `jj new main` will error
out, complaining that the revset resolved to multiple revisions.
name with a double question mark suffix (e.g. `main??`) 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 `jj new main`
will error out, complaining that the revset resolved to multiple revisions.
Both local branches (e.g. `main`) and the remote branch (e.g. `main@origin`) can
have conflicts. Both can end up in that state if concurrent operations were run