Skip to content
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

CC-34832 nonsplit to split merge #1650

Merged
merged 51 commits into from
Dec 9, 2024

Conversation

spryker-release-bot
Copy link
Contributor

Auto created via release app as upgrade check for releasing. @gechetspr

Please check if merge conflicts have been resolved correctly, and then manually merge once all is confirmed and Travis is green.

Important: As part of the auto-release (and nonsplit to split merge functionality), this PR must NOT be merged using "squash".
Please make sure to use normal merge ("Create merge commit") if done manually.

Overview

Git Merge Conflict Details:
On branch bugfix/cc-34832/remember-me
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)

Changes to be committed:
modified: .git.docker
modified: config/Shared/config_default.php

Unmerged paths:
(use "git add/rm ..." as appropriate to mark resolution)
deleted by us: deploy.platform-biba.yml
deleted by us: deploy.platform-boba.yml
deleted by us: docker

Copy link

composer.lock

Package changes

Package Operation From To About
behat/gherkin upgrade v4.10.0 v4.11.0 diff
doctrine/deprecations upgrade 1.1.3 1.1.4 diff
league/csv upgrade 9.18.0 9.19.0 diff
league/uri upgrade 7.4.1 7.5.1 diff
league/uri-interfaces upgrade 7.4.1 7.5.0 diff
psy/psysh upgrade v0.12.5 v0.12.6 diff

Dev Package changes

Package Operation From To About
phpdocumentor/reflection-docblock upgrade 5.6.0 5.6.1 diff

Settings · Docs · Powered by Private Packagist

@spryker-release-bot spryker-release-bot merged commit 0b45834 into master Dec 9, 2024
27 checks passed
@spryker-release-bot spryker-release-bot deleted the bugfix/cc-34832/remember-me branch December 9, 2024 10:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants