Skip to content

Commit 229089b

Browse files
authored
Update gitattributes to use the union merge driver for release notes (#11252)
1 parent 3a8d307 commit 229089b

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

.gitattributes

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,8 @@
4848
*.vbproj text=auto
4949
*.fsproj text=auto
5050
*.dbproj text=auto
51-
*.sln text=auto eol=crlf
51+
*.sln text=auto eol=crlf
52+
53+
# Use union on release notes to keep both local and remote changes
54+
# and avoid merge conflicts.
55+
release_notes.md merge=union

0 commit comments

Comments
 (0)