Force local headings to over-ride remote#185
Open
rgee0 wants to merge 1 commit intoalexellis:masterfrom
Open
Conversation
A recent issue (alexellis/go-execute#10) indirectly highlighted that the merging of local and remote configs was producing a superset which included duplicate headings. The intended mode of operation for the Issue template headings was for the local to over-ride the remote. This is diffent to the other fields, such as maintainers. This change adds the test to highlight the issue and addresses the issue in MergeDerekRepoConfigs. Signed-off-by: Richard Gee <richard@technologee.co.uk>
This file contains hidden or 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
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.
Signed-off-by: Richard Gee richard@technologee.co.uk
Description
The intended mode of operation for the Issue template headings was
for the local to over-ride the remote. This is different to the other
fields, such as maintainers.
This change adds the test to highlight the issue and addresses the
issue in MergeDerekRepoConfigs.
Motivation and Context
A recent issue (alexellis/go-execute#10)
indirectly highlighted that the merging of local and remote configs
was producing a superset which included duplicate headings
How Has This Been Tested?
Wrote the test, and ran it:
Note the
gotset is a merge of the remote and local so includes#2twice.Amended
MergeDerekRepoConfigs()so that ifrequired_in_issueis set locally then those values will take precedence.Re-ran the test:
Ran a build using the Dockerfile.
Types of changes
Checklist:
git commit -s