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

FAQ: remove workaround for fixed bug (#2476)

Browse source
This commit is contained in:
Martin von Zweigbergk 2024-08-01 08:56:38 -07:00 committed by Martin von Zweigbergk
parent 6c41b1bef8
commit 5b2259445e
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
docs/FAQ.md
View file

@ -162,11 +162,6 @@ this is to abandon the unneeded commits (using `jj abandon <commit ID>`). If you
would like to keep both commits with this change ID, you can `jj duplicate` one
of them before abandoning it.
Usually, the different commits associated with the divergent change ID should all
appear in the log, but due to #2476, they may not. If that happens, you can
either use `jj log -r 'all()' | grep <change id>` or disable the
`revsets.short-prefixes` config option.
### How do I deal with conflicted branches ('??' after branch name)?
A [conflicted branch][branches_conflicts] is a branch that refers to multiple