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 label casing #172

Merged
merged 3 commits into from
Jun 24, 2023
Merged

Fix label casing #172

merged 3 commits into from
Jun 24, 2023

Conversation

felixfontein
Copy link
Collaborator

Fixes #167.

@felixfontein felixfontein added the backport-1 Automatically create backport to stable-1 branch label Jun 20, 2023
@felixfontein felixfontein merged commit dc29608 into ansible-community:main Jun 24, 2023
@patchback
Copy link

patchback bot commented Jun 24, 2023

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

❌ Failed to cleanly apply dc29608 on top of patchback/backports/stable-1/dc2960887270f2a286306a54cf5cae6571b1128b/pr-172

Backporting merged PR #172 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-community/antsibull-docs.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/dc2960887270f2a286306a54cf5cae6571b1128b/pr-172 upstream/stable-1
  4. Now, cherry-pick PR Fix label casing #172 contents into that branch:
    $ git cherry-pick -x dc2960887270f2a286306a54cf5cae6571b1128b
    If it'll yell at you with something like fatal: Commit dc2960887270f2a286306a54cf5cae6571b1128b is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x dc2960887270f2a286306a54cf5cae6571b1128b
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix label casing #172 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-1/dc2960887270f2a286306a54cf5cae6571b1128b/pr-172
  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 casing branch June 24, 2023 07:50
felixfontein added a commit to felixfontein/antsibull-docs that referenced this pull request Jun 24, 2023
* Fix reference casing.

* Factor out utility function.

* Add tests.

(cherry picked from commit dc29608)
@felixfontein
Copy link
Collaborator Author

felixfontein commented Jun 24, 2023

Manual backport in #174.

felixfontein added a commit that referenced this pull request Jun 24, 2023
* Fix reference casing.

* Factor out utility function.

* Add tests.

(cherry picked from commit dc29608)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-1 Automatically create backport to stable-1 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Make sure label casing is OK
1 participant