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

docs: call out manual branch management

Browse source 
Many new users coming from Git get confused that branches don't
automatically follow commits. Call this out and give hints to the
expected workflow.
This commit is contained in:
Glen Choo 2023-08-03 11:00:42 -07:00
parent 84f807d222
commit 16ef3f7edc
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
docs/git-comparison.md
View file

@ -26,6 +26,13 @@ various use cases.
state in Jujutsu (there's actually no way -- yet, at least -- to have an
active branch). However, Jujutsu keeps track of all visible heads (leaves) of
the commit graph, so the commits won't get lost or garbage-collected.
* **No current branch.** Git lets you check out a branch, making it the 'current
branch', and new commits will automatically update the branch. This is
necessary in Git because Git might otherwise lose track of the new commits.
Jujutsu does not have a 'current branch'; instead, you update branches
manually. For example, if you check out a commit with a branch, new commits
are created on top of the branch, then you issue a later command to update the
branch.
* **Conflicts can be committed.** No commands fail because of merge conflicts.
The conflicts are instead recorded in commits and you can resolve them later.
[Details](conflicts.md).