diff options
| author | Dario Nieuwenhuis <[email protected]> | 2025-09-05 16:27:48 +0200 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2025-09-05 16:27:48 +0200 |
| commit | b8577a31338358d10b1fdb7dd374b0c7eafe86b5 (patch) | |
| tree | f47096df9439164fe7245763d3374469127383c3 | |
| parent | 1c2fa92293e52157582b92766e75381a228bbaf1 (diff) | |
Use merge=union for changelogs to avoid constant conflicts.
| -rw-r--r-- | .gitattributes | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index a51376f0d..2850eb3b1 100644 --- a/.gitattributes +++ b/.gitattributes | |||
| @@ -17,6 +17,13 @@ | |||
| 17 | 17 | ||
| 18 | .vscode/*.json linguist-language=JSON-with-Comments | 18 | .vscode/*.json linguist-language=JSON-with-Comments |
| 19 | 19 | ||
| 20 | # Configure changelog files to use union merge strategy | ||
| 21 | # This prevents merge conflicts by automatically combining changes from both branches | ||
| 22 | CHANGELOG.md merge=union | ||
| 23 | changelog.md merge=union | ||
| 24 | CHANGELOG.txt merge=union | ||
| 25 | changelog.txt merge=union | ||
| 26 | |||
| 20 | *.raw binary | 27 | *.raw binary |
| 21 | *.bin binary | 28 | *.bin binary |
| 22 | *.png binary | 29 | *.png binary |