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

Fix spelling errors in porting guides #500

Merged
merged 1 commit into from
Oct 4, 2023
Merged

Conversation

rose2221
Copy link
Contributor

@rose2221 rose2221 commented Oct 3, 2023

i've changed the files as mentioned in issue no. #455 Fix spelling errors in porting guides

Fixes #455

@rose2221 rose2221 changed the title solves issue no. #455 solves issue no. @455 Oct 3, 2023
@github-actions github-actions bot added the needs_triage Needs a first human triage before being processed. label Oct 3, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Oct 3, 2023

Thanks for your contribution, @rose2221! Please make sure that your pull request includes sufficient and meaningful details in the description.
PR descriptions provide important context and allow other developers and our future selves to understand a change's rationale and what it actually fixes or accomplishes.

@gotmax23 gotmax23 linked an issue Oct 3, 2023 that may be closed by this pull request
@gotmax23 gotmax23 added the new_contributor This PR is the first contribution by a new community member. label Oct 3, 2023
@gotmax23
Copy link
Collaborator

gotmax23 commented Oct 3, 2023

Thanks for your Ansible docs contribution! We talk about Ansible documentation on matrix at #docs:ansible.im and on libera IRC at #ansible-docs if you ever want to join us and chat about the docs! We meet there on Tuesdays (see the Ansible calendar) and welcome additions to our weekly agenda items - scroll down to find the upcoming agenda and add a comment to put something new on that agenda.

@gotmax23 gotmax23 changed the title solves issue no. @455 Fix spelling errors in porting guides Oct 3, 2023
@rose2221
Copy link
Contributor Author

rose2221 commented Oct 4, 2023

please merge this pull request if it has no conflicts @gotmax23

@samccann samccann removed the needs_triage Needs a first human triage before being processed. label Oct 4, 2023
@samccann samccann merged commit 6ba2cb9 into ansible:devel Oct 4, 2023
6 checks passed
@samccann
Copy link
Contributor

samccann commented Oct 4, 2023

Thanks @rose2221 for the Ansible docs fix and welcome to the Ansible project!

@samccann samccann added backport-2.15 Automatically create a backport for the stable-2.15 branch backport-2.14 Automatically create a backport for the stable-2.14 branch backport-2.13 Automatically create a backport for the stable-2.13 branch backport-2.16 Automatically create a backport for the stable-2.16 branch labels Oct 4, 2023
@patchback
Copy link

patchback bot commented Oct 4, 2023

Backport to stable-2.15: 💔 cherry-picking failed — target branch does not exist

❌ Failed to fetch https://github.com/ansible/ansible-documentation.git

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

@patchback
Copy link

patchback bot commented Oct 4, 2023

Backport to stable-2.14: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-2.14/6ba2cb974980d63c0deed878997ebbdfeb741c55/pr-500

Backported as #509

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

@patchback
Copy link

patchback bot commented Oct 4, 2023

Backport to stable-2.16: 💔 cherry-picking failed — target branch does not exist

❌ Failed to fetch https://github.com/ansible/ansible-documentation.git

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

@patchback
Copy link

patchback bot commented Oct 4, 2023

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

❌ Failed to cleanly apply 6ba2cb9 on top of patchback/backports/stable-2.13/6ba2cb974980d63c0deed878997ebbdfeb741c55/pr-500

Backporting merged PR #500 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.13/6ba2cb974980d63c0deed878997ebbdfeb741c55/pr-500 upstream/stable-2.13
  4. Now, cherry-pick PR Fix spelling errors in porting guides #500 contents into that branch:
    $ git cherry-pick -x 6ba2cb974980d63c0deed878997ebbdfeb741c55
    If it'll yell at you with something like fatal: Commit 6ba2cb974980d63c0deed878997ebbdfeb741c55 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 6ba2cb974980d63c0deed878997ebbdfeb741c55
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix spelling errors in porting guides #500 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-2.13/6ba2cb974980d63c0deed878997ebbdfeb741c55/pr-500
  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 bot pushed a commit that referenced this pull request Oct 4, 2023
(cherry picked from commit 6ba2cb9)
samccann pushed a commit that referenced this pull request Oct 4, 2023
(cherry picked from commit 6ba2cb9)

Co-authored-by: Rose Jethani <101273941+rose2221@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-2.13 Automatically create a backport for the stable-2.13 branch backport-2.14 Automatically create a backport for the stable-2.14 branch backport-2.15 Automatically create a backport for the stable-2.15 branch backport-2.16 Automatically create a backport for the stable-2.16 branch new_contributor This PR is the first contribution by a new community member.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fix spelling errors in porting guides
3 participants