Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changelog entries create merge conflicts #655

Open
Oberon00 opened this issue Jun 15, 2020 · 1 comment
Open

Changelog entries create merge conflicts #655

Oberon00 opened this issue Jun 15, 2020 · 1 comment
Labels
area:miscellaneous For issues that don't match any other area label question Question for discussion release:after-ga Not required before GA release, and not going to work on before GA

Comments

@Oberon00
Copy link
Member

Oberon00 commented Jun 15, 2020 •
edited
Loading

The changelog entries we have at the moment create merge conflicts for every PR that touches the changelog file. I have seen a neat solution to this in the pytest repository where each changelog entry is placed in its own file in a changelog subdirectory and before a release, they run a tool that collects all entries into a single text. See https://github.com/pytest-dev/pytest/blob/master/CONTRIBUTING.rst#preparing-pull-requests
@carlosalberto carlosalberto added the question Question for discussion label Jun 26, 2020
@carlosalberto carlosalberto added release:required-for-ga Must be resolved before GA release, or nice to have before GA area:miscellaneous For issues that don't match any other area label labels Jul 10, 2020
@carlosalberto carlosalberto added the priority:p3 Lowest priority level label Jul 24, 2020
@tigrannajaryan
Copy link
Member

I think this is a nice-to-have, not a must-have for 1.0 GA. I suggest to remove release:required-for-ga label.

@Oberon00 Oberon00 added release:after-ga Not required before GA release, and not going to work on before GA and removed release:required-for-ga Must be resolved before GA release, or nice to have before GA labels Sep 9, 2020
@andrewhsu andrewhsu removed the priority:p3 Lowest priority level label Sep 9, 2020
@tigrannajaryan tigrannajaryan mentioned this issue Jul 21, 2022
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
area:miscellaneous For issues that don't match any other area label question Question for discussion release:after-ga Not required before GA release, and not going to work on before GA
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
4 participants
@andrewhsu @carlosalberto @Oberon00 @tigrannajaryan