Skip to content

Conversation

@webknjaz
Copy link
Member

This fixes an incorrect conflict resolution problem that happened in 0cdc3a5 while backporting PR #97533 as PR #107115 (merged prematurely). This problem caused GitHub Actions CI/CD to crash while attempting to load the workflow file definition, preventing the jobs that are defined in .github/workflows/build.yml from actually starting.

This fixes an incorrect conflict resolution problem that happened in 0cdc3a5 while backporting PR python#97533 as PR python#107115 (merged prematurely). This problem caused GitHub Actions CI/CD to crash while attempting to load the workflow file definition, preventing the jobs that are defined in `.github/workflows/build.yml` from actually starting.
@webknjaz
Copy link
MemberAuthor

@ambv auto-merge, maybe?

@ambvambv enabled auto-merge (squash) July 23, 2023 13:28
@ambvambv merged commit 07acf57 into python:3.11Jul 23, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@webknjaz@ambv@bedevere-bot