-
-
Notifications
You must be signed in to change notification settings - Fork 29
Keep first manufacturer in merge #392
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.
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
Open
ganko-pi
wants to merge
9
commits into
CycloneDX:main
Choose a base branch
from
ganko-pi:merge-manufacturer
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
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
Signed-off-by: Ganko Pi <[email protected]>
Signed-off-by: Ganko Pi <[email protected]>
Signed-off-by: Ganko Pi <[email protected]>
Member
|
Not fully convinced. Isn't the merged BOM a new BOM whose manufacturer could be another organization? |
Author
|
Maybe this should be made optional by a flag e.g. --keep-manufacturer. |
Member
|
I agree. I have no concern when making it optional. |
Signed-off-by: Ganko Pi <[email protected]>
Signed-off-by: Ganko Pi <[email protected]>
06b574c to
3ec1228
Compare
…tional parameters Signed-off-by: Ganko Pi <[email protected]>
Signed-off-by: Ganko Pi <[email protected]>
…turer in XML doc Signed-off-by: Ganko Pi <[email protected]>
110fcc7 to
cc0dedb
Compare
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.
Currently all manufacturer are discarded when merging. To improve this behavior the first found manufacturer is kept.