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

FAQ: Add another problem to be aware of when co-locating a repo

Browse source
This commit is contained in:
Ilya Grigoriev 2024-09-09 20:24:29 -07:00
parent 5aa6fa5974
commit 74e3c4efe2
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
docs/FAQ.md
View file

@ -55,6 +55,15 @@ important ones are:
- Interleaving `git` and `jj` commands may create confusing bookmark conflicts - Interleaving `git` and `jj` commands may create confusing bookmark conflicts
or divergent changes. or divergent changes.
- If the working copy commit or its parent contain any conflicted files, tools
expecting a Git repo may interpret the commit contents or its diff in a wrong
and confusing way. You should avoid doing mutating operations with Git tools
and ignore the confusing information such tools present for conflicted commits
(unless you are curious about [the details of how `jj` stores
conflicts](technical/conflicts.md)). See
[\#3979](https://github.com/martinvonz/jj/issues/3979) for plans to improve
this situation.
- Jujutsu commands may be a little slower in very large repositories due to - Jujutsu commands may be a little slower in very large repositories due to
importing and exporting changes to Git. Most repositories are not noticeably importing and exporting changes to Git. Most repositories are not noticeably
affected by this. affected by this.