Skip to content

Conversation

@jacobtylerwalls
Copy link
Member

Refs python/cpython#125415

(cherry picked from commit fe01bda)

@jacobtylerwalls jacobtylerwalls added this to the 3.3.6 milestone Dec 8, 2024
@jacobtylerwalls jacobtylerwalls changed the title Add compatibility with python 3.13.1 (#2647) [backport maintenance/3.3.x] Add compatibility with python 3.13.1 (#2647) Dec 8, 2024
@jacobtylerwalls jacobtylerwalls changed the title [backport maintenance/3.3.x] Add compatibility with python 3.13.1 (#2647) [Backport maintenance/3.3.x] Add compatibility with python 3.13.1 (#2647) Dec 8, 2024
@jacobtylerwalls jacobtylerwalls enabled auto-merge (squash) December 8, 2024 12:19
@Pierre-Sassoulas
Copy link
Member

So when you fix a merge conflict at the same time than someone else the server side state reconciliation is done with a little yellow warning in the top right of the screen while your commit get rejected 😄 (never saw that before)

@jacobtylerwalls jacobtylerwalls merged commit 0834156 into pylint-dev:maintenance/3.3.x Dec 8, 2024
13 of 15 checks passed
@jacobtylerwalls jacobtylerwalls deleted the backport-2647-to-maintenance/3.3.x branch December 8, 2024 12:24
@jacobtylerwalls
Copy link
Member Author

Let's not repeat that for the release, ha. Would you like to release?

@Pierre-Sassoulas
Copy link
Member

Sorry for not answering the mail client took a very long time to deliver this mail, I was going to ask the same question 😄

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.

2 participants