krel changelog: remove other CHANGELOG-*.md only on first RC #1182
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We should remove other changelog files only on the first release candidate to avoid merge conflicts on branch fast forward. An integration test for this case has been added as well. Signed-off-by: Sascha Grunert <sgrunert@suse.com>
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cpanato, justaugustus, saschagrunert The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
puerco
added a commit
to puerco/release
that referenced
this pull request
Mar 17, 2020
krel changelog: remove other CHANGELOG-*.md only on first RC Signed-off-by: Puerco <adolfo.garcia@uservers.net>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
/kind bug
What this PR does / why we need it:
We should remove other changelog files only on the first release
candidate to avoid merge conflicts on branch fast forward. An
integration test for this case has been added as well.
Which issue(s) this PR fixes:
None
Special notes for your reviewer:
/cc @justaugustus @cpanato @liggitt
Does this PR introduce a user-facing change?