Improve role argspec documentation #1126
Merged
Patchback / Backport to stable-2.15
completed
Feb 15, 2024 in 19s
Backport to stable-2.15: 💔 cherry-picking failed — conflicts found
❌ Failed to cleanly apply be66e62 on top of patchback/backports/stable-2.15/be66e621614c40de6759095a1a9bb8b37a14fcf1/pr-1126
Details
Backporting merged PR #1126 into devel
- 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/ansible-documentation.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-2.15/be66e621614c40de6759095a1a9bb8b37a14fcf1/pr-1126 upstream/stable-2.15
- Now, cherry-pick PR #1126 contents into that branch:
If it'll yell at you with something like
$ git cherry-pick -x be66e621614c40de6759095a1a9bb8b37a14fcf1
fatal: Commit be66e621614c40de6759095a1a9bb8b37a14fcf1 is a merge but no -m option was given.
, add-m 1
as follows instead:$ git cherry-pick -m1 -x be66e621614c40de6759095a1a9bb8b37a14fcf1
- At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR #1126 as close to the
original as possible. - Push this branch to your fork on GitHub:
$ git push origin patchback/backports/stable-2.15/be66e621614c40de6759095a1a9bb8b37a14fcf1/pr-1126
- 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