mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-06 03:22:59 +00:00
parent
d8869aea97
commit
fe06ef471b
1 changed files with 1 additions and 1 deletions
|
@ -110,7 +110,7 @@ Because we allow bookmarks (etc.) to be in a conflicted state rather than just
|
|||
erroring out when there are multiple heads, the user can continue to use the
|
||||
repo, including performing further operations on the repo. Of course, some
|
||||
commands will fail when using a conflicted bookmark. For example,
|
||||
`jj checkout main` when `main` is in a conflicted state will result in an error
|
||||
`jj new main` when `main` is in a conflicted state will result in an error
|
||||
telling you that `main` resolved to multiple revisions.
|
||||
|
||||
### Storage
|
||||
|
|
Loading…
Reference in a new issue