Closed pedro-psb closed 4 weeks ago
❌ Failed to cleanly apply 5cc3da77f939b296fe544d262e6140c89760524b on top of patchback/backports/2.14/5cc3da77f939b296fe544d262e6140c89760524b/pr-1797
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_container.git
$ git fetch upstream
$ git checkout -b patchback/backports/2.14/5cc3da77f939b296fe544d262e6140c89760524b/pr-1797 upstream/2.14
$ git cherry-pick -x 5cc3da77f939b296fe544d262e6140c89760524b
If it'll yell at you with something like fatal: Commit 5cc3da77f939b296fe544d262e6140c89760524b is a merge but no -m option was given.
, add -m 1
as follows instead:
$ git cherry-pick -m1 -x 5cc3da77f939b296fe544d262e6140c89760524b
$ git push origin patchback/backports/2.14/5cc3da77f939b296fe544d262e6140c89760524b/pr-1797
🤖 @patchback I'm built with octomachinery and my source is open — https://github.com/sanitizers/patchback-github-app.
❌ Failed to cleanly apply 5cc3da77f939b296fe544d262e6140c89760524b on top of patchback/backports/2.15/5cc3da77f939b296fe544d262e6140c89760524b/pr-1797
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_container.git
$ git fetch upstream
$ git checkout -b patchback/backports/2.15/5cc3da77f939b296fe544d262e6140c89760524b/pr-1797 upstream/2.15
$ git cherry-pick -x 5cc3da77f939b296fe544d262e6140c89760524b
If it'll yell at you with something like fatal: Commit 5cc3da77f939b296fe544d262e6140c89760524b is a merge but no -m option was given.
, add -m 1
as follows instead:
$ git cherry-pick -m1 -x 5cc3da77f939b296fe544d262e6140c89760524b
$ git push origin patchback/backports/2.15/5cc3da77f939b296fe544d262e6140c89760524b/pr-1797
🤖 @patchback I'm built with octomachinery and my source is open — https://github.com/sanitizers/patchback-github-app.
❌ Failed to cleanly apply 5cc3da77f939b296fe544d262e6140c89760524b on top of patchback/backports/2.16/5cc3da77f939b296fe544d262e6140c89760524b/pr-1797
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_container.git
$ git fetch upstream
$ git checkout -b patchback/backports/2.16/5cc3da77f939b296fe544d262e6140c89760524b/pr-1797 upstream/2.16
$ git cherry-pick -x 5cc3da77f939b296fe544d262e6140c89760524b
If it'll yell at you with something like fatal: Commit 5cc3da77f939b296fe544d262e6140c89760524b is a merge but no -m option was given.
, add -m 1
as follows instead:
$ git cherry-pick -m1 -x 5cc3da77f939b296fe544d262e6140c89760524b
$ git push origin patchback/backports/2.16/5cc3da77f939b296fe544d262e6140c89760524b/pr-1797
🤖 @patchback I'm built with octomachinery and my source is open — https://github.com/sanitizers/patchback-github-app.
❌ Failed to cleanly apply 5cc3da77f939b296fe544d262e6140c89760524b on top of patchback/backports/2.21/5cc3da77f939b296fe544d262e6140c89760524b/pr-1797
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_container.git
$ git fetch upstream
$ git checkout -b patchback/backports/2.21/5cc3da77f939b296fe544d262e6140c89760524b/pr-1797 upstream/2.21
$ git cherry-pick -x 5cc3da77f939b296fe544d262e6140c89760524b
If it'll yell at you with something like fatal: Commit 5cc3da77f939b296fe544d262e6140c89760524b is a merge but no -m option was given.
, add -m 1
as follows instead:
$ git cherry-pick -m1 -x 5cc3da77f939b296fe544d262e6140c89760524b
$ git push origin patchback/backports/2.21/5cc3da77f939b296fe544d262e6140c89760524b/pr-1797
🤖 @patchback I'm built with octomachinery and my source is open — https://github.com/sanitizers/patchback-github-app.
❌ Failed to cleanly apply 5cc3da77f939b296fe544d262e6140c89760524b on top of patchback/backports/2.20/5cc3da77f939b296fe544d262e6140c89760524b/pr-1797
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_container.git
$ git fetch upstream
$ git checkout -b patchback/backports/2.20/5cc3da77f939b296fe544d262e6140c89760524b/pr-1797 upstream/2.20
$ git cherry-pick -x 5cc3da77f939b296fe544d262e6140c89760524b
If it'll yell at you with something like fatal: Commit 5cc3da77f939b296fe544d262e6140c89760524b is a merge but no -m option was given.
, add -m 1
as follows instead:
$ git cherry-pick -m1 -x 5cc3da77f939b296fe544d262e6140c89760524b
$ git push origin patchback/backports/2.20/5cc3da77f939b296fe544d262e6140c89760524b/pr-1797
🤖 @patchback I'm built with octomachinery and my source is open — https://github.com/sanitizers/patchback-github-app.
These fields were introduced in 2.19. I am backporting the change only to 2.20 and 2.2.
See context: https://github.com/pulp/pulp_rpm/issues/3639