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

[8.13](backport #3916) Delete serverless directory on backport PRs #4014

Merged
merged 3 commits into from
Jun 17, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 17, 2024

Simplified version of #3889 that doesn't work for some reason. Introduces conflicts. works after @colleenmcginnis fixed it.


This is an automatic backport of pull request #3916 done by Mergify.

* simplified action that produces conflicts

* Update delete-serverless-dir-on-backports.yml

* Update .github/workflows/delete-serverless-dir-on-backports.yml

* Update .github/workflows/delete-serverless-dir-on-backports.yml

* add to readme

(cherry picked from commit 4a57e39)

# Conflicts:
#	README.md
@mergify mergify bot requested a review from a team as a code owner June 17, 2024 14:23
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 17, 2024
Copy link
Contributor Author

mergify bot commented Jun 17, 2024

Cherry-pick of 4a57e39 has failed:

On branch mergify/bp/8.13/pr-3916
Your branch is up to date with 'origin/8.13'.

You are currently cherry-picking commit 4a57e394.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   .github/workflows/delete-serverless-dir-on-backports.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   README.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@bmorelli25 bmorelli25 enabled auto-merge (squash) June 17, 2024 14:40
@bmorelli25 bmorelli25 removed the conflicts There is a conflict in the backported pull request label Jun 17, 2024
@bmorelli25 bmorelli25 merged commit cc08bfa into 8.13 Jun 17, 2024
4 checks passed
@bmorelli25 bmorelli25 deleted the mergify/bp/8.13/pr-3916 branch June 17, 2024 15:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant