Skip to content

fix(configuration): align with credential merge logic#608

Merged
jakobmoellerdev merged 3 commits into
open-component-model:mainfrom
fabianburth:fix/resolver-config-merge
Aug 22, 2025
Merged

fix(configuration): align with credential merge logic#608
jakobmoellerdev merged 3 commits into
open-component-model:mainfrom
fabianburth:fix/resolver-config-merge

Conversation

@fabianburth

Copy link
Copy Markdown
Contributor

What this PR does / why we need it

Align the merge logic with the change proposed in: #607

Which issue(s) this PR fixes

Signed-off-by: Fabian Burth <fabian.burth@sap.com>
@fabianburth fabianburth requested a review from a team as a code owner August 21, 2025 21:18
@github-actions github-actions Bot added the kind/bugfix Bug label Aug 21, 2025
@fabianburth fabianburth self-assigned this Aug 21, 2025
@github-actions github-actions Bot added the size/xs Extra small label Aug 21, 2025
@jakobmoellerdev jakobmoellerdev merged commit eb5a51d into open-component-model:main Aug 22, 2025
16 checks passed
fabianburth added a commit to fabianburth/open-component-model that referenced this pull request Aug 27, 2025
fabianburth added a commit to fabianburth/open-component-model that referenced this pull request Aug 27, 2025
…omponent-model#608)"

This reverts commit eb5a51d.

Signed-off-by: Fabian Burth <fabian.burth@sap.com>
jakobmoellerdev pushed a commit that referenced this pull request Aug 27, 2025
… merge logic (#608)" (#705)

This reverts commit eb5a51d.

<!-- markdownlint-disable MD041 -->
#### What this PR does / why we need it
We decided against doing the change in the credential merge logic
(#607 (comment))
and only accidentally merged this PR.

#### Which issue(s) this PR fixes
<!--
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
-->

Signed-off-by: Fabian Burth <fabian.burth@sap.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

kind/bugfix Bug size/xs Extra small

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants