Skip to content

Commit

Permalink
[cascading] from release/9.6.0-rc to main (#1229)
Browse files Browse the repository at this point in the history
<!--
{"currentBranch":"release/9.6.0-rc","targetBranch":"main","bypassReviewers":false,"isConflicting":false}
-->

## Cascading from release/9.6.0-rc to main

---

: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 1229
  git pull --ff origin main
  ```

  and update this Pull Request with

  ```shell
  gh pr push 1229
  ```
</details>

<details>
  <summary>Using <b>git</b> only</summary>

  ```shell
  git fetch origin
  git checkout origin/cascading/9.6.0-rc-main
  git pull --ff origin main
  ```

  and update this Pull Request with

  ```shell
  git push origin HEAD:cascading/9.6.0-rc-main
  ```
</details>

---

<small>This Pull Request has been generated with :heart: by the
[Otter](https://github.com/AmadeusITGroup/otter) cascading tool.</small>
  • Loading branch information
kpanot authored Jan 16, 2024
2 parents 3043ba5 + d2662c4 commit 015c62e
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 015c62e

Please sign in to comment.