caleb-brown/gitattributes
1
0
Fork 0
mirror of https://github.com/gitattributes/gitattributes.git synced 2025-01-22 08:18:50 -05:00
Code

Do not use merge=union for C# projects, F# projects, and VS solutions

Browse Source 
As per #21, `merge=union` can cause potential troubles.
This commit is contained in:
Sergey Volkov 2022-07-07 21:31:21 +03:00
parent 42a4442155
commit ecf304efaa
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CSharp.gitattributes
View File

@ -4,5 +4,5 @@
*.cs text diff=csharp *.cs text diff=csharp
*.cshtml text diff=html *.cshtml text diff=html
*.csx text diff=csharp *.csx text diff=csharp
*.sln text eol=crlf merge=union *.sln text eol=crlf
*.csproj text merge=union *.csproj text eol=crlf

4
FSharp.gitattributes
View File

@ -3,5 +3,5 @@
*.fs text diff=fsharp *.fs text diff=fsharp
*.fsx text diff=fsharp *.fsx text diff=fsharp
*.sln text eol=crlf merge=union *.sln text eol=crlf
*.fsproj text merge=union *.fsproj text eol=crlf