embedded-hal/.gitattributes at master - embedded-hal - Gitea: Git with a cup of tea

itsscb/embedded-hal

mirror of https://github.com/rust-embedded/embedded-hal.git synced 2026-03-10 07:40:23 +00:00

Dario Nieuwenhuis 8f492bc173 Set merge=union Git attribute for CHANGELOG.md

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.

2021-12-20 22:02:34 +01:00

1 line

24 B

Plaintext

Raw Permalink Blame History

CHANGELOG.md merge=union