jj/docs/technical
Yuya Nishihara af4fe21452 files, tree: make same-change conflict resolution configurable
I have no idea if we can change the default, but maybe we can conditionally
disable the same-change rule to get rid of hacks in squash_commits(), etc.?

resolve_file_executable() doesn't respect the Store configuration. I'm not sure
if that's the right choice, but it seemed better to accept duplicated change
than falling back to executable=false.

#6369
2025-09-11 13:14:28 +00:00
..
architecture.md view: rename workspace "id" to "name" 2025-03-31 03:39:29 +00:00
concurrency.md docs: standardize usage of term "colocate" without the hyphen 2025-09-05 16:32:25 +00:00
conflicts.md files, tree: make same-change conflict resolution configurable 2025-09-11 13:14:28 +00:00
types.svg docs: update types diagram to reflect rename of LocalBackend to SimpleBackend 2025-03-18 06:52:00 +00:00