itsscb/embedded-hal
1
0
Fork 0
mirror of https://github.com/rust-embedded/embedded-hal.git synced 2025-09-29 22:01:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set merge=union Git attribute for CHANGELOG.md

Browse Source 
Currently all PRs add a line to CHANGELOG.md, usually at the end. This means
they almost always run into merge conflicts since they are adding different lines at the exact same
place in the file.

With merge=union Git will automatically resolve these merge conflicts by keeping all lines from both sides.
This commit is contained in:
Dario Nieuwenhuis 2021-12-20 22:02:34 +01:00
parent a0bd3dc56a
commit 8f492bc173
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
CHANGELOG.md merge=union