summaryrefslogtreecommitdiff
path: root/.github
AgeCommit message (Collapse)Author
2023-05-09fix the list URLHeiko Schlittermann (HS12-RIPE)
2018-02-25meta: git controls for text changelogs; github controlsPhil Pennock
For the ChangeLog and files like it, use `merge=union` to bring in content from both sides instead of having conflicts block merges because someone else added a feature. For GitHub, provide some "templates" which really just point people in the right direction, but if the repointing fails, at least reduces the pain a little.