🔧 Updates .gitattributes to include merge strategy for Directory.Packages.template.props - Upstream always wins
This commit is contained in:
1
.gitattributes
vendored
1
.gitattributes
vendored
@@ -1 +1,2 @@
|
||||
Directory.Packages.props merge=union
|
||||
Directory.Packages.template.props merge=upstream-wins
|
||||
|
||||
Reference in New Issue
Block a user