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.13 -> 1.14 #16736

Merged
merged 2 commits into from
Aug 17, 2024
Merged

[UPMERGE] 1.13 -> 1.14 #16736

merged 2 commits into from
Aug 17, 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.14 -m "Resolve conflicts between 1.13 and 1.14"

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 push the changes to this PR.

Sylius Bot and others added 2 commits August 16, 2024 02:20
This PR has been generated automatically.
For more details see
[refactor.yaml](/Sylius/Sylius/blob/1.12/.github/workflows/refactor.yaml).
@SyliusBot SyliusBot requested review from a team as code owners August 17, 2024 02:16
@probot-autolabeler probot-autolabeler bot added the API APIs related issues and PRs. label Aug 17, 2024
@Rafikooo Rafikooo merged commit c54c667 into 1.14 Aug 17, 2024
53 checks passed
@Rafikooo Rafikooo deleted the upmerge/1.13_1.14 branch August 17, 2024 19:11
@SyliusBot SyliusBot restored the upmerge/1.13_1.14 branch August 18, 2024 02:19
@SyliusBot SyliusBot deleted the upmerge/1.13_1.14 branch August 19, 2024 02:18
@SyliusBot SyliusBot restored the upmerge/1.13_1.14 branch August 20, 2024 02:17
@SyliusBot SyliusBot deleted the upmerge/1.13_1.14 branch August 21, 2024 02:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
API APIs related issues and PRs.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants