[cascading] from release/11.1.0-rc to main #2084
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
![otter-cascading[bot]](https://avatars.githubusercontent.com/in/318094?s=60&v=4){kind=small}
## Proposed change With the current implementation of migration-scripts, all the changes need to be documented at project level. This is not very convenient when the changes happen in a library that the project depends on. The proposal is to add a script to aggregate all the changes from the project + those of the libraries in the migration scripts that will be used for metadata-check and CMS updates ## Related issues - 🐛 Fixes #(issue) - 🚀 Feature #(issue) <!-- Please make sure to follow the contributing guidelines on https://github.com/amadeus-digital/Otter/blob/main/CONTRIBUTING.md -->
…/otter into cascading/11.0.0-11.1.0-rc
<!--
{"currentBranch":"release/11.0","targetBranch":"release/11.1.0-rc","bypassReviewers":false,"isConflicting":false}
-->
## Cascading from release/11.0 to release/11.1.0-rc
---
:heavy_exclamation_mark: The pull request is conflicting with the target
branch.
You can fix the issue locally with the following commands:
<details open>
<summary>Using <b>gh CLI</b></summary>
```shell
gh pr checkout 2082
git pull --ff origin release/11.1.0-rc
```
and update this Pull Request with
```shell
gh pr push 2082
```
</details>
<details>
<summary>Using <b>git</b> only</summary>
```shell
git fetch origin
git checkout origin/cascading/11.0.0-11.1.0-rc
git pull --ff origin release/11.1.0-rc
```
and update this Pull Request with
```shell
git push origin HEAD:cascading/11.0.0-11.1.0-rc
```
</details>
---
<small>This Pull Request has been generated with :heart: by the
[Otter](https://github.com/AmadeusITGroup/otter) cascading tool.</small>
matthieu-crouzet
approved these changes
Aug 23, 2024
matthieu-crouzet
temporarily deployed
to
cascading-app
GitHub Actions
Inactive
matthieu-crouzet
temporarily deployed
to
production
GitHub Actions
Inactive
matthieu-crouzet
temporarily deployed
to
production
GitHub Actions
Inactive
kpanot
approved these changes
Aug 23, 2024
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.
Cascading from release/11.1.0-rc to main
The configuration requests the cascading to bypass reviewer in case of CI success.
To not bypass the reviewing process, please check the following checkbox:
This Pull Request has been generated with ❤️ by the Otter cascading tool.