Skip to content

Add merge logic for targetConfig #816#838

Merged
dannyvv merged 2 commits intomicrosoft:masterfrom
dannyvv:pr/Fix816
Sep 1, 2025
Merged

Add merge logic for targetConfig #816#838
dannyvv merged 2 commits intomicrosoft:masterfrom
dannyvv:pr/Fix816

Conversation

@dannyvv
Copy link
Member

@dannyvv dannyvv commented Dec 18, 2024

Add merge logic for targetConfig objects. See spec: #816

@dannyvv dannyvv requested a review from kenotron as a code owner December 18, 2024 23:01
@dannyvv
Copy link
Member Author

dannyvv commented Dec 18, 2024

This PR is built upon previous PR's: #836 & #837

@ecraig12345
Copy link
Member

@dannyvv I see a bunch of merge conflicts--was this implemented in some other PR?

@dannyvv dannyvv requested review from ecraig12345 and removed request for kenotron July 25, 2025 19:18
@dannyvv dannyvv requested a review from Saadnajmi August 30, 2025 20:55
@dannyvv dannyvv enabled auto-merge (squash) August 30, 2025 21:20
@dannyvv dannyvv requested a review from hansenyy August 30, 2025 21:54
// { pipeline: { "@lage-run/globby#transpile": { type: "npmScript" } }
// We conciously add these 'after' the ones in lage.config.js
// to indicate that the more specific package.json definition takes
// precedence over the global lage.config.js.
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(nit) Unnecessary space.

@dannyvv dannyvv merged commit 5f2d283 into microsoft:master Sep 1, 2025
36 of 46 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants