Skip to content

Conversation

@x1101
Copy link
Contributor

@x1101 x1101 commented Jun 9, 2025

Fixes #2707

@samccann samccann added backport-2.16 backport-2.18 Automatically create a backport for the stable-2.18 branch backport-2.19 Automatically create a backport for the stable-2.19 branch labels Jun 10, 2025
@samccann samccann merged commit 28bad28 into ansible:devel Jun 10, 2025
12 checks passed
@patchback
Copy link

patchback bot commented Jun 10, 2025

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

❌ Failed to cleanly apply 28bad28 on top of patchback/backports/stable-2.16/28bad285001e3b0ad776cf6ad248f75ff719760c/pr-2708

Backporting merged PR #2708 into devel

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

@patchback
Copy link

patchback bot commented Jun 10, 2025

Backport to stable-2.17: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-2.17/28bad285001e3b0ad776cf6ad248f75ff719760c/pr-2708

Backported as #2711

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

patchback bot pushed a commit that referenced this pull request Jun 10, 2025
Fixes #2707

(cherry picked from commit 28bad28)
@patchback
Copy link

patchback bot commented Jun 10, 2025

Backport to stable-2.18: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-2.18/28bad285001e3b0ad776cf6ad248f75ff719760c/pr-2708

Backported as #2712

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

@patchback
Copy link

patchback bot commented Jun 10, 2025

Backport to stable-2.19: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-2.19/28bad285001e3b0ad776cf6ad248f75ff719760c/pr-2708

Backported as #2713

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

patchback bot pushed a commit that referenced this pull request Jun 10, 2025
Fixes #2707

(cherry picked from commit 28bad28)
samccann pushed a commit that referenced this pull request Jun 12, 2025
Fixes #2707

(cherry picked from commit 28bad28)

Co-authored-by: Lyle McKarns <[email protected]>
samccann pushed a commit that referenced this pull request Jun 12, 2025
Fixes #2707

(cherry picked from commit 28bad28)

Co-authored-by: Lyle McKarns <[email protected]>
samccann pushed a commit that referenced this pull request Jun 12, 2025
Fixes #2707

(cherry picked from commit 28bad28)

Co-authored-by: Lyle McKarns <[email protected]>
@x1101 x1101 deleted the patch-1 branch September 19, 2025 16:36
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 backport-2.19 Automatically create a backport for the stable-2.19 branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Redundant link

2 participants