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

Improve communication info #953

Merged
merged 1 commit into from
Aug 12, 2024
Merged

Conversation

felixfontein
Copy link
Collaborator

SUMMARY

Improve communication info.

ISSUE TYPE
  • Docs Pull Request
COMPONENT NAME

README.md
docs/docsite/links.yml

@felixfontein felixfontein merged commit d367686 into ansible-collections:main Aug 12, 2024
127 checks passed
Copy link
Contributor

patchback bot commented Aug 12, 2024

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

❌ Failed to cleanly apply d367686 on top of patchback/backports/stable-2/d36768609d7b0d6105775296ebb9a82afe0d16ce/pr-953

Backporting merged PR #953 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.docker.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/d36768609d7b0d6105775296ebb9a82afe0d16ce/pr-953 upstream/stable-2
  4. Now, cherry-pick PR Improve communication info #953 contents into that branch:
    $ git cherry-pick -x d36768609d7b0d6105775296ebb9a82afe0d16ce
    If it'll yell at you with something like fatal: Commit d36768609d7b0d6105775296ebb9a82afe0d16ce is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x d36768609d7b0d6105775296ebb9a82afe0d16ce
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Improve communication info #953 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-2/d36768609d7b0d6105775296ebb9a82afe0d16ce/pr-953
  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 comm branch August 12, 2024 15:05
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.

1 participant