Repository navigation
Commit 34cae7b
fix(git): merge project files as text, without the union driver
`.gitattributes` gave `*.fsproj`, `*.csproj`, `*.vbproj`, `*.dbproj` and `*.sln` the merge driver `union`. That driver
reports no conflict: where two branches change the same lines, it keeps the lines of both. A branch that replaces a
legacy file deletes the `<Compile>` line of the file, and the union brought the line back, or listed a file twice, when
another branch had changed the lines next to it. The project of `feat/queue` merged with `feat/stack` listed `Stack.fs`
and `Queue.fs`, which neither branch has any more, and the build failed with FS0225. Three of sixteen pairs of the open
branches merged into such a project.
Without the driver these merges stop at a conflict in the project file, which is resolved together with the other
conflicts of the merge. F# compiles the files in the order of the project file, so the merged order needs that look.
Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>1 parent 140e532 commit 34cae7b
1 file changed
Lines changed: 3 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | | - | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
15 | 13 | | |
16 | 14 | | |
17 | 15 | | |
| |||
0 commit comments