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

..

invalid

config-schema: add --when and --scope keys

2025-08-30 21:31:39 +00:00

valid

files, tree: make same-change conflict resolution configurable

2025-09-11 13:14:28 +00:00