Closed mdellweg closed 10 months ago
❌ Failed to cleanly apply 4f6301c15cff148853c8386aa4713edbc326b748 on top of patchback/backports/1.5/4f6301c15cff148853c8386aa4713edbc326b748/pr-332
origin
remote.upstream
. If you don't
have it, here's how you can add it:
$ git remote add upstream https://github.com/pulp/pulp-certguard.git
$ git fetch upstream
$ git checkout -b patchback/backports/1.5/4f6301c15cff148853c8386aa4713edbc326b748/pr-332 upstream/1.5
$ git cherry-pick -x 4f6301c15cff148853c8386aa4713edbc326b748
If it'll yell at you with something like fatal: Commit 4f6301c15cff148853c8386aa4713edbc326b748 is a merge but no -m option was given.
, add -m 1
as follows instead:
$ git cherry-pick -m1 -x 4f6301c15cff148853c8386aa4713edbc326b748
$ git push origin patchback/backports/1.5/4f6301c15cff148853c8386aa4713edbc326b748/pr-332
🤖 @patchback I'm built with octomachinery and my source is open — https://github.com/sanitizers/patchback-github-app.
Make use of ci_requirements.txt to install python-dateutil and rhsm. There is no good reason to add an extra codepath to the plugin-template for this.
[noissue]
(cherry picked from commit a0028564b26c97fccb741b24f188ac2743a7c119)