Mergeable edits

Structure prevents most conflicts (see one-feature-one-file); this skill covers the shared files that legitimately remain: registration lines, registries, config lists, and the generated files no structure can remove. The goal is edits shaped so git's line-based merge resolves concurrent branches on its own.

Lists and registries

• One item per line, with a trailing comma or delimiter on every line, so adding an item is a strict one-line diff that touches no neighbor.
• Insert in a stable order, alphabetical unless the list is order-sensitive. Appending at the bottom makes every concurrent branch collide on the same last line; ordered inserts scatter across the file and merge cleanly.
• For a file that is genuinely an order-independent set of lines, a .gitattributes merge=union driver removes conflicts entirely. Use it sparingly: union merge never reports a conflict, so it is only safe where a duplicated or reordered line is harmless.