Skip to content

Conversation

@pulpbot
Copy link
Member

@pulpbot pulpbot commented Jan 7, 2026

No description provided.

@mdellweg mdellweg merged commit 8964681 into main Jan 7, 2026
14 checks passed
@mdellweg mdellweg deleted the update_cli branch January 7, 2026 13:23
@patchback
Copy link

patchback bot commented Jan 7, 2026

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

❌ Failed to cleanly apply 8964681 on top of patchback/backports/0.4/89646819e938d442dcb093b202c1cd15d859e166/pr-238

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants