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

docs/working-copy.md: Mention jj resolve

Browse source
This commit is contained in:
Ilya Grigoriev 2023-01-12 22:58:03 -08:00
parent eff903634c
commit d197eddea6
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
docs/working-copy.md
View file

@ -42,12 +42,12 @@ with conflicts directly in the working copy by using `jj edit <commit>`. The
main disadvantage of that is that it's harder to inspect the conflict main disadvantage of that is that it's harder to inspect the conflict
resolutions. resolutions.
There's not yet a way of resolving conflicts in an external merge tool With the `jj resolve` command, you can use an external merge tool to resolve
(https://github.com/martinvonz/jj/issues/18). There's also no good way of conflicts that have 2 sides and a base. There is not yet a good way of
resolving conflicts between directories, files, and symlinks resolving conflicts between directories, files, and symlinks
(https://github.com/martinvonz/jj/issues/19). You can use `jj restore` to (https://github.com/martinvonz/jj/issues/19). You can use `jj restore` to choose
choose one side of the conflict, but there's no way to even see where the one side of the conflict, but there's no way to even see where the involved
involved parts came from. parts came from.
## Ignored files ## Ignored files