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

[UPMERGE] 1.12 -> 1.13 #16018

Merged
merged 4 commits into from Mar 19, 2024
Merged

[UPMERGE] 1.12 -> 1.13 #16018

merged 4 commits into from Mar 19, 2024

Conversation

SyliusBot
Copy link

This PR has been generated automatically.
For more details see upmerge_pr.yaml.

Remember! The upmerge should always be merged with using Merge pull request button.

In case of conflicts, please resolve them manually with usign the following commands:

git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/1.13 -m "Resolve conflicts between 1.12 and 1.13"

If you use other name for the upstream remote, please replace upstream with the name of your remote pointing to the Sylius/Sylius repository.

Once the conflicts are resolved, please run git merge --continue and change the commit title to

Resolve conflicts between 1.12 and 1.13

Wojdylak and others added 2 commits March 19, 2024 09:28
This PR was merged into the 1.12 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.12
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | N/A
| License         | MIT


Commits
-------
  [Maintenance] Add api-platform changes to phpstan-baseline.neon
@SyliusBot SyliusBot requested review from a team as code owners March 19, 2024 09:01
@Rafikooo Rafikooo force-pushed the upmerge/1.12_1.13-f10e6b0dea branch from 0bd6d5c to 6f8fc7c Compare March 19, 2024 09:18
Rafikooo
Rafikooo previously approved these changes Mar 19, 2024
Copy link

github-actions bot commented Mar 19, 2024

Bunnyshell Preview Environment deleted

Available commands:

  • /bns:deploy to redeploy the environment

@Rafikooo Rafikooo force-pushed the upmerge/1.12_1.13-f10e6b0dea branch from 70efaeb to e7de6a6 Compare March 19, 2024 09:38
@Wojdylak Wojdylak merged commit a2c6a8d into 1.13 Mar 19, 2024
30 checks passed
@Wojdylak
Copy link
Member

Thank you, @SyliusBot!

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.

None yet

3 participants