Bump antsibull-docs and antsibull-docs-parser versions #1799
Patchback / Backport to stable-2.16
completed
Aug 26, 2024 in 22s
Backport to stable-2.16: 💔 cherry-picking failed — conflicts found
❌ Failed to cleanly apply b0315c3 on top of patchback/backports/stable-2.16/b0315c3637cc7b97ad93a2a51c237a0f1ad91d7b/pr-1799
Details
Backporting merged PR #1799 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.16/b0315c3637cc7b97ad93a2a51c237a0f1ad91d7b/pr-1799 upstream/stable-2.16
- Now, cherry-pick PR #1799 contents into that branch:
If it'll yell at you with something like
$ git cherry-pick -x b0315c3637cc7b97ad93a2a51c237a0f1ad91d7b
fatal: Commit b0315c3637cc7b97ad93a2a51c237a0f1ad91d7b is a merge but no -m option was given.
, add-m 1
as follows instead:$ git cherry-pick -m1 -x b0315c3637cc7b97ad93a2a51c237a0f1ad91d7b
- At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR #1799 as close to the
original as possible. - Push this branch to your fork on GitHub:
$ git push origin patchback/backports/stable-2.16/b0315c3637cc7b97ad93a2a51c237a0f1ad91d7b/pr-1799
- 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