[Maintenance] Add conflict with api-platform/core 2.7.17 #16011
Merged
Conversation
This file contains 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
Member
Wojdylak
commented
Mar 18, 2024
Wojdylak
commented
| Q | A |
|---|---|
| Branch? | 1.12 |
| Bug fix? | yes |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no |
| Related tickets | #16010 |
| License | MIT |
probot-autolabeler
bot
added
the
Maintenance
Wojdylak
changed the title
Bunnyshell Preview Environment deletedAvailable commands:
|
jakubtobiasz
approved these changes
Mar 18, 2024
Rafikooo
approved these changes
Mar 18, 2024
|
Thank you, @Wojdylak! |
jakubtobiasz
added a commit
that referenced
this pull request
Mar 18, 2024
This PR was merged into the 1.13 branch. Discussion ---------- This PR has been generated automatically. For more details see [upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.github/workflows/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 ``` Commits ------- [Maintenance] Add conflict to api-platform/core 2.7.17 [Maintenance] Add conflict with api-platform/core 2.7.17 to sylius/api minor #16011 [Maintenance] Add conflict with api-platform/core 2.7.17 (Wojdylak) Resolve conflicts between 1.12 and 1.13
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.