fix: Remove the usage of pkg_resources + add debugging instructions #2375
Patchback / Backport to stable-4.10
completed
Dec 2, 2024 in 3s
Backport to stable-4.10: 💔 cherry-picking failed — conflicts found
❌ Failed to cleanly apply ed0ef4e on top of patchback/backports/stable-4.10/ed0ef4e0a18a7b6fe81f3389d5b495af84da95bd/pr-2375
Details
Backporting merged PR #2375 into master
- 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/ansible/galaxy_ng.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/stable-4.10/ed0ef4e0a18a7b6fe81f3389d5b495af84da95bd/pr-2375 upstream/stable-4.10
- Now, cherry-pick PR #2375 contents into that branch:
If it'll yell at you with something like
$ git cherry-pick -x ed0ef4e0a18a7b6fe81f3389d5b495af84da95bd
fatal: Commit ed0ef4e0a18a7b6fe81f3389d5b495af84da95bd is a merge but no -m option was given.
, add-m 1
as follows instead:$ git cherry-pick -m1 -x ed0ef4e0a18a7b6fe81f3389d5b495af84da95bd
- At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR #2375 as close to the
original as possible. - Push this branch to your fork on GitHub:
$ git push origin patchback/backports/stable-4.10/ed0ef4e0a18a7b6fe81f3389d5b495af84da95bd/pr-2375
- 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