Lxd instance not found fix false positives #7521
Merged
This check has been archived and is scheduled for deletion.
Learn more about checks retention
Patchback / Backport to stable-7
completed
Dec 3, 2023 in 4s
Backport to stable-7: 💔 cherry-picking failed — conflicts found
❌ Failed to cleanly apply b4a2e9d on top of patchback/backports/stable-7/b4a2e9da50d7483c985e8fc2bcfb12db75b437c4/pr-7521
Details
Backporting merged PR #7521 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/ansible-collections/community.general.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-7/b4a2e9da50d7483c985e8fc2bcfb12db75b437c4/pr-7521 upstream/stable-7
- Now, cherry-pick PR #7521 contents into that branch:
If it'll yell at you with something like
$ git cherry-pick -x b4a2e9da50d7483c985e8fc2bcfb12db75b437c4
fatal: Commit b4a2e9da50d7483c985e8fc2bcfb12db75b437c4 is a merge but no -m option was given.
, add-m 1
as follows instead:$ git cherry-pick -m1 -x b4a2e9da50d7483c985e8fc2bcfb12db75b437c4
- At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR #7521 as close to the
original as possible. - Push this branch to your fork on GitHub:
$ git push origin patchback/backports/stable-7/b4a2e9da50d7483c985e8fc2bcfb12db75b437c4/pr-7521
- 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