#195 added a conflict example to `line_based.rs`, which caused Git to be confused again #199

New issue

Closed

opened 2025-02-10 19:05:02 +01:00 by ada4a · 1 comment

ada4a commented

2025-02-10 19:05:02 +01:00

Owner

This kind of highlights the fragility of the solution used in #167 (hardcoding the paths in .gitattributes). Since dealing with conflicts is the whole point of this codebase, and so conflict examples might realistically appear in any file (not to mention changes to the module structure), maybe we should just set * conflict_marker_size=15, i.e. for all files?

This kind of highlights the fragility of the solution used in #167 (hardcoding the paths in `.gitattributes`). Since dealing with conflicts is the whole point of this codebase, and so conflict examples might realistically appear in any file (not to mention changes to the module structure), maybe we should just set `* conflict_marker_size=15`, i.e. for all files?