Fix internal mypy error on Windows #13153
Merged
Patchback / Backport to 8.3.x
completed
Jan 21, 2025 in 7s
Backport to 8.3.x: 💔 cherry-picking failed — conflicts found
❌ Failed to cleanly apply 2f1c143 on top of patchback/backports/8.3.x/2f1c143b17edab8e1525d553e0757a5fc27bb068/pr-13153
Details
Backporting merged PR #13153 into main
- Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be yourorigin
remote. - Make sure you have an upstream repo added as a remote too. In these
instructions you'll refer to it by the nameupstream
. If you don't
have it, here's how you can add it:$ git remote add upstream https://github.com/pytest-dev/pytest.git
- Ensure you have the latest copy of upstream and prepare a branch
that will hold the backported code:$ git fetch upstream $ git checkout -b patchback/backports/8.3.x/2f1c143b17edab8e1525d553e0757a5fc27bb068/pr-13153 upstream/8.3.x
- Now, cherry-pick PR #13153 contents into that branch:
If it'll yell at you with something like
$ git cherry-pick -x 2f1c143b17edab8e1525d553e0757a5fc27bb068
fatal: Commit 2f1c143b17edab8e1525d553e0757a5fc27bb068 is a merge but no -m option was given.
, add-m 1
as follows instead:$ git cherry-pick -m1 -x 2f1c143b17edab8e1525d553e0757a5fc27bb068
- At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR #13153 as close to the
original as possible. - Push this branch to your fork on GitHub:
$ git push origin patchback/backports/8.3.x/2f1c143b17edab8e1525d553e0757a5fc27bb068/pr-13153
- Create a PR, ensure that the CI is green. If it's not — update it so that
the tests and any other checks pass. This is it!
Now relax and wait for the maintainers to process your pull request
when they have some cycles to do reviews. Don't worry — they'll tell you if
any improvements are necessary when the time comes!
Loading