itsscb/esp-hal
1
0
Fork 0
mirror of https://github.com/esp-rs/esp-hal.git synced 2025-09-26 20:00:32 +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; 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:
Jesse Braham 2023-07-12 09:15:09 -07:00 committed by Jesse Braham
parent 58651f03b6
commit 8598e188b1
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