cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-07 00:12:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,012 Commits 144 Branches 35 Tags
Commit Graph

4 Commits

Author SHA1 Message Date
Martin von Zweigbergk
1aa2aec141 bookmarks: update some leftover uses of the word "branch" 2024-09-11 19:19:31 -07:00
Martin von Zweigbergk
ec7f9e79f6 docs: update description of conflicts to be about tree-level conflicts 
Fixes #2373
 2023-11-30 14:24:48 -08:00
Martin von Zweigbergk
d087e64abf cleanup: consistently (?) put removed conflict terms before added ones 2023-05-25 04:24:26 -07:00
Martin von Zweigbergk
b64ee147ae docs: add technical doc about a conflict design 
We used to have documention about how conflicts are implemented, but I
removed that a long time ago when I rewrote the README to target users
rather than VCS hackers. Let's have a doc for the VCS hackers (and
curious users) as well, though.
 2022-03-09 21:08:41 -08:00