itsscb/embassy
1
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2025-09-27 04:10:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use merge=union for changelogs to avoid constant conflicts.

Browse Source
This commit is contained in:
Dario Nieuwenhuis 2025-09-05 16:27:48 +02:00
parent 1c2fa92293
commit b8577a3133
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitattributes vendored
View File

@ -17,6 +17,13 @@
.vscode/*.json linguist-language=JSON-with-Comments .vscode/*.json linguist-language=JSON-with-Comments
# Configure changelog files to use union merge strategy
# This prevents merge conflicts by automatically combining changes from both branches
CHANGELOG.md merge=union
changelog.md merge=union
CHANGELOG.txt merge=union
changelog.txt merge=union
*.raw binary *.raw binary
*.bin binary *.bin binary
*.png binary *.png binary