Skip to content

Implement multi-file merge semantics - #27

Merged
GaTTGeng merged 5 commits into
masterfrom
codex/issue-11-merge-semantics
Jul 29, 2026
Merged

Implement multi-file merge semantics#27
GaTTGeng merged 5 commits into
masterfrom
codex/issue-11-merge-semantics

Conversation

@GaTTGeng

Copy link
Copy Markdown
Owner

Summary

Implements the first documented, field-level multi-file merge increment for ComposeFileLoader.LoadMerged.

  • Merge raw YAML documents before parsing so omitted fields remain distinguishable from explicit overlays.
  • Merge maps recursively; replace scalars; append lists with replacement rules for service resource targets, command, entrypoint, and healthcheck.test.
  • Reject unsupported Compose merge tags (!reset and !override) with a source-file diagnostic.
  • Add fixture-driven conformance coverage and document the supported merge behavior.

Closes #11.

Validation

  • dotnet restore ComposeSharp.sln
  • dotnet build ComposeSharp.sln --configuration Release --no-restore
  • dotnet test ComposeSharp.sln --configuration Release --no-build --no-restore
  • dotnet pack ComposeSharp.sln --configuration Release --no-build --no-restore --output artifacts/packages
  • ./scripts/VerifyPackageReadme.ps1

@GaTTGeng
GaTTGeng marked this pull request as ready for review July 29, 2026 03:48
Copilot AI review requested due to automatic review settings July 29, 2026 03:48

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 901ca027c2

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread src/ComposeSharp.Loader/ComposeFileLoader.cs Outdated
Comment thread src/ComposeSharp.Loader/ComposeFileLoader.cs Outdated

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: d63b430513

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread src/ComposeSharp.Loader/ComposeFileLoader.cs Outdated
Comment thread src/ComposeSharp.Loader/ComposeFileLoader.cs Outdated

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 404427c09a

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread src/ComposeSharp.Loader/ComposeFileLoader.cs Outdated
Comment thread src/ComposeSharp.Loader/ComposeFileLoader.cs

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 92efa62167

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread src/ComposeSharp.Loader/ComposeFileLoader.cs
Comment thread src/ComposeSharp.Loader/ComposeFileLoader.cs Outdated
@GaTTGeng
GaTTGeng merged commit 9fe10d9 into master Jul 29, 2026
1 check 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.

Replace whole-service overlay with documented merge semantics

2 participants