Skip to content

Conversation

mdellweg
Copy link
Member

No description provided.

@mdellweg mdellweg marked this pull request as ready for review October 14, 2025 08:44
@mdellweg mdellweg enabled auto-merge (rebase) October 14, 2025 08:44
@mdellweg mdellweg disabled auto-merge October 15, 2025 09:14
@mdellweg mdellweg merged commit 0f06dd0 into pulp:main Oct 15, 2025
18 checks passed
@mdellweg mdellweg deleted the python-314 branch October 15, 2025 09:14
Copy link

patchback bot commented Oct 15, 2025

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

❌ Failed to cleanly apply 0f06dd0 on top of patchback/backports/0.36/0f06dd0e39c689d89df6784e996d3898b289791b/pr-1255

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

1 participant