Skip to content

Update CLI and GLUE - #276

Merged
mdellweg merged 1 commit into
mainfrom
update_cli
Oct 12, 2026
Merged

mdellweg merged 1 commit into
mainfrom
update_cli

Conversation

@github-actions

Copy link
Copy Markdown

No description provided.

@mdellweg
mdellweg merged commit db354aa into main Oct 12, 2026
23 of 25 checks passed
@mdellweg
mdellweg deleted the update_cli branch October 12, 2026 06:36
@patchback

patchback Bot commented Nov 12, 2026 •

Copy link
Copy Markdown

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

❌ Failed to cleanly apply db354aa on top of patchback/backports/0.5/db354aa32ce75eb838f473014e982d7f27e3384d/pr-276

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

2 participants