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

Sync opencraft-release/palm.1 with Upstream 20231106-1699229227 #600

Conversation

opencraft-requirements-bot

Syncing opencraft-release/palm.1 with Upstream

Important❗

Please always use the "Create a merge commit" option as it avoids issues when checking diffs with upstream.

Note on Conflicts ⚠️

In cases of conflicts you can go ahead and resolve it here on Github if it is simple enough. However if it is a more complicated conflict please follow the steps below:

  1. Check out sync-open-release/palm.master-20231106-1699229227 locally:
  2. Pull latest changes from opencraft-release/palm.1 into that branch, make sure your [REMOTE] is pointing to opencraft-release/palm.1:
git pull [REMOTE] opencraft-release/palm.1
  1. Resolve the conflicts locally, then commit the result. This will create a new merge commit.
  2. Push the new merge commit to sync-open-release/palm.master-20231106-1699229227 to update this PR
  3. Review the PR again and merge when ready!
    Note: Please use the "Create a merge commit" option as it avoids issues when checking diffs with upstream.

DmytroAlipov and others added 5 commits May 15, 2023 13:05
@Agrendalath Agrendalath merged commit 0eef233 into opencraft-release/palm.1 Nov 7, 2023
82 checks passed
@Agrendalath Agrendalath deleted the sync-open-release/palm.master-20231106-1699229227 branch November 7, 2023 18:00
@open-craft-grove
Copy link

Sandbox update request received. Deployment will start soon.

@Agrendalath
Copy link
Member

@gabor-boros, I think our bot just went rogue ^

@gabor-boros
Copy link
Member

Passing to @kaustavb12 and @mtyaka now. I guess it is triggered by the destroy pipeline.

@kaustavb12
Copy link
Member

@gabor-boros is right. This message was triggered by the destroy pipeline.

The message needs to be changed or suppressed for the destroy pipelines.

@mtyaka
Copy link
Member

mtyaka commented Nov 11, 2023

We're tracking this via https://tasks.opencraft.com/browse/SE-6076

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.

9 participants