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

Bump pulp-cli compatibility #82

Merged
merged 1 commit into from
Jul 3, 2024
Merged

Bump pulp-cli compatibility #82

merged 1 commit into from
Jul 3, 2024

Conversation

mdellweg
Copy link
Member

@mdellweg mdellweg commented Jul 3, 2024

No description provided.

@mdellweg mdellweg merged commit 10d53a7 into pulp:main Jul 3, 2024
10 checks passed
Copy link

patchback bot commented Jul 3, 2024

Backport to 0.5: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 10d53a7 on top of patchback/backports/0.5/10d53a7402f584b3cb8caf231447739904b74362/pr-82

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

@mdellweg mdellweg deleted the bump_cli branch July 3, 2024 08:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant