Skip to content
This repository has been archived by the owner on Nov 2, 2023. It is now read-only.

Make RELEASES.md less conflict prone #34

Open
alice-i-cecile opened this issue Jul 18, 2022 · 0 comments
Open

Make RELEASES.md less conflict prone #34

alice-i-cecile opened this issue Jul 18, 2022 · 0 comments
Labels
C: ci Continuous integration D: trivial Suitable for first contributions I: moderate Solidly useful S: ready-for-implementation This issue needs to be implemented in a concrete form T: enhancement A new feature

Comments

@alice-i-cecile
Copy link
Contributor

What problem does this solve?

RELEASES.md is nice, but merge conflicts are common and pointless.

What solution would you like?

Setting CHANGELOG.md merge=union in .gitattributes mostly eliminates spurious merges conflicts on the changelog.
@alice-i-cecile alice-i-cecile added T: enhancement A new feature D: trivial Suitable for first contributions C: ci Continuous integration I: moderate Solidly useful S: ready-for-implementation This issue needs to be implemented in a concrete form labels Jul 18, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees
No one assigned
Labels
C: ci Continuous integration D: trivial Suitable for first contributions I: moderate Solidly useful S: ready-for-implementation This issue needs to be implemented in a concrete form T: enhancement A new feature
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@alice-i-cecile