Skip to content

[stable-2.19] Extension for Ansible redirects #2691

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

Merged
merged 2 commits into from
Jun 26, 2025

Conversation

oraNod
Copy link
Contributor

@oraNod oraNod commented Jun 5, 2025

This is a manual backport of the changes in #2418 that add a redirects extension.

@oraNod oraNod added the backport-2.18 Automatically create a backport for the stable-2.18 branch label Jun 26, 2025
@oraNod oraNod merged commit 0102e34 into ansible:stable-2.19 Jun 26, 2025
12 checks passed
Copy link

patchback bot commented Jun 26, 2025

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

❌ Failed to cleanly apply 0102e34 on top of patchback/backports/stable-2.18/0102e3455734c3d9b312f52d80fa854bc64cca84/pr-2691

Backporting merged PR #2691 into stable-2.19

  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.18/0102e3455734c3d9b312f52d80fa854bc64cca84/pr-2691 upstream/stable-2.18
  4. Now, cherry-pick PR [stable-2.19] Extension for Ansible redirects #2691 contents into that branch:
    $ git cherry-pick -x 0102e3455734c3d9b312f52d80fa854bc64cca84
    If it'll yell at you with something like fatal: Commit 0102e3455734c3d9b312f52d80fa854bc64cca84 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 0102e3455734c3d9b312f52d80fa854bc64cca84
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR [stable-2.19] Extension for Ansible redirects #2691 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-2.18/0102e3455734c3d9b312f52d80fa854bc64cca84/pr-2691
  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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-2.18 Automatically create a backport for the stable-2.18 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants