Skip to content

Commit

Permalink
docs: conflicted branches have two "?" as suffix
Browse files Browse the repository at this point in the history
Looks like we forgot to update this when we changed from one to two
question marks.
  • Loading branch information
martinvonz committed May 17, 2024
1 parent 0a48ac6 commit 8e0ac1d
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions docs/branches.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8e0ac1d

Please sign in to comment.