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: correct the markup in module documentation #235

Merged
merged 5 commits into from
Apr 6, 2022
Merged

fix: correct the markup in module documentation #235

merged 5 commits into from
Apr 6, 2022

Conversation

hunleyd
Copy link
Collaborator

@hunleyd hunleyd commented Apr 6, 2022

Fix the in-module markup for the documentation missed in #227

hunleyd added 4 commits April 2, 2022 15:29
…resql into remove_priv_arg

* 'main' of github.com:ansible-collections/community.postgresql:
  correct the pipeline error about 'warn' (#229)
  README: update list of ansible-core versions we test against (#228)
@hunleyd hunleyd self-assigned this Apr 6, 2022
@hunleyd hunleyd requested a review from Andersson007 April 6, 2022 15:18
Copy link
Collaborator

@Andersson007 Andersson007 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM @hunleyd thanks!

@Andersson007 Andersson007 merged commit 218641f into ansible-collections:main Apr 6, 2022
@patchback
Copy link

patchback bot commented Apr 6, 2022

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

❌ Failed to cleanly apply 218641f on top of patchback/backports/stable-1/218641f24473574c3d59cad2b5bb5b9ad886982f/pr-235

Backporting merged PR #235 into main

  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-collections/community.postgresql.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-1/218641f24473574c3d59cad2b5bb5b9ad886982f/pr-235 upstream/stable-1
  4. Now, cherry-pick PR fix: correct the markup in module documentation #235 contents into that branch:
    $ git cherry-pick -x 218641f24473574c3d59cad2b5bb5b9ad886982f
    If it'll yell at you with something like fatal: Commit 218641f24473574c3d59cad2b5bb5b9ad886982f is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x 218641f24473574c3d59cad2b5bb5b9ad886982f
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR fix: correct the markup in module documentation #235 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-1/218641f24473574c3d59cad2b5bb5b9ad886982f/pr-235
  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
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants