Opentelemetry-specification: Changelog entries create merge conflicts

Created on 15 Jun 2020  路  1Comment  路  Source: open-telemetry/opentelemetry-specification

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

miscellaneous question after-ga

Most helpful comment

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.

>All comments

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.

Was this page helpful?
0 / 5 - 0 ratings