Martin von Zweigbergk
1aa2aec141
bookmarks: update some leftover uses of the word "branch"
2024-09-11 19:19:31 -07:00
Martin von Zweigbergk
cc15ecf7c7
op log: change "resolve concurrent" to "reconcile divergent"
...
"Concurrent" operations are not necessarily actually concurrent, so
"divergent" seems like a better name. And "reconcile" seems like a
better term for merging them, though we also sometimes use "merge".
2024-08-30 21:56:11 -07:00
Ilya Grigoriev
be8be2e55a
docs: More info about syncing jj repo with rsync
...
This will be used for context in the next commit
Includes a mention of
https://github.com/martinvonz/jj/issues/2193 .
2023-09-06 09:15:27 -07:00
Ilya Grigoriev
8f29afaafd
docs: markdown fixups, mostly to remove links pointing outside docs
...
This makes mkdocs compile cleanly
2023-08-28 10:43:48 -07:00
Martin von Zweigbergk
1dbf4df3ea
docs: mention that the "view" object knows about all workspaces
...
I seem to have forgotten to update this when I added support for
workspaces a while back.
I made some other little touchups while at it.
2022-12-08 17:30:29 -08:00
Martin von Zweigbergk
6e23b5b052
docs: change "current checkout" to "working-copy commit"
...
I think "the working-copy commit" is clearer.
2022-09-18 16:19:58 -07:00
Martin von Zweigbergk
4e20548e32
docs: some futher touch-ups of concurrency.md
2022-01-12 23:20:22 -08:00
Martin von Zweigbergk
4c45844aba
docs: fix a typo in concurrency doc
2022-01-10 07:58:27 -08:00
Martin von Zweigbergk
94fda7935a
docs: add technical doc about lock-free concurrency design
2022-01-09 22:03:19 -08:00
