Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable-2.16] Bump antsibull-docs to 2.11.0. (#1417) #1419

Merged
merged 1 commit into from
May 7, 2024

Conversation

felixfontein
Copy link
Collaborator

Backport of #1417 to stable-2.16.

@felixfontein felixfontein added the backport-2.15 Automatically create a backport for the stable-2.15 branch label May 6, 2024
@samccann samccann merged commit f0a27d0 into ansible:stable-2.16 May 7, 2024
8 checks passed
Copy link

patchback bot commented May 7, 2024

Backport to stable-2.15: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply f0a27d0 on top of patchback/backports/stable-2.15/f0a27d09943e4d898e8071770af838bf2ac01236/pr-1419

Backporting merged PR #1419 into stable-2.16

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible/ansible-documentation.git
  3. 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/f0a27d09943e4d898e8071770af838bf2ac01236/pr-1419 upstream/stable-2.15
  4. Now, cherry-pick PR [stable-2.16] Bump antsibull-docs to 2.11.0. (#1417) #1419 contents into that branch:
    $ git cherry-pick -x f0a27d09943e4d898e8071770af838bf2ac01236
    If it'll yell at you with something like fatal: Commit f0a27d09943e4d898e8071770af838bf2ac01236 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x f0a27d09943e4d898e8071770af838bf2ac01236
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR [stable-2.16] Bump antsibull-docs to 2.11.0. (#1417) #1419 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-2.15/f0a27d09943e4d898e8071770af838bf2ac01236/pr-1419
  7. 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!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@felixfontein felixfontein deleted the antsibull-docs branch May 7, 2024 19:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-2.15 Automatically create a backport for the stable-2.15 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants