Sync branch: merge master into development - #538
Merged
Conversation
Bumps [codeinwp/themeisle-sdk](https://github.com/Codeinwp/themeisle-sdk) from 3.3.55 to 3.3.58. - [Release notes](https://github.com/Codeinwp/themeisle-sdk/releases) - [Changelog](https://github.com/Codeinwp/themeisle-sdk/blob/v3.3.58/CHANGELOG.md) - [Commits](Codeinwp/themeisle-sdk@v3.3.55...v3.3.58) --- updated-dependencies: - dependency-name: codeinwp/themeisle-sdk dependency-version: 3.3.57 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
…emeisle-sdk-3.3.57 chore(deps): bump codeinwp/themeisle-sdk from 3.3.55 to 3.3.58
The automated master -> development sync failed with a merge conflict after the themeisle-sdk bump landed on master (PR #533). Resolved by keeping development's composer.lock, taking only the themeisle-sdk entry from master (3.3.56 -> 3.3.58); development's dev-dependency set is unchanged. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Contributor
Contributor
|
🎉 This PR is included in version 2.6.23 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
pirate-bot
added
the
released
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
2 participants
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.
Restores the
master→developmentsync so release PR #534 can merge.The automated Sync branches workflow failed with a 409 merge conflict after the themeisle-sdk bump landed on
master(run 30452282623), leavingdevelopment3 commits behind and #534 in a CONFLICTING state.How the conflict was resolved
The only conflict was the
codeinwp/themeisle-sdkentry incomposer.lock:developmenthad 3.3.56,masterhas 3.3.58 from #533.composer.lock— kept development's lock and took only the themeisle-sdk stanza frommaster(3.3.56 → 3.3.58). Taking master's file wholesale would have reverted development's dev-dependency set (phpstan, php-stubs/wordpress-stubs, phpunit ^9.6) that came with the testing setup. The lock parses,composer validateis clean, andcontent-hashstill matches development'scomposer.json, which the merge kept unchanged..github/dependabot.yml— taken frommaster; it addstarget-branch: "development", so future dependency bumps in this repo targetdevelopmentand this split should not recur.No source files are touched.