Skip to content

Update CLI and GLUE

9b14b0b
Select commit
Loading
Failed to load commit list.
Merged

Update CLI and GLUE #141

Update CLI and GLUE
9b14b0b
Select commit
Loading
Failed to load commit list.
Patchback / Backport to 0.5 completed Jan 7, 2026 in 3s

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

❌ Failed to cleanly apply 67736fe on top of patchback/backports/0.5/67736fea0bbde075c05d4116f3c8619d334e5868/pr-141

Details

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