Closed ggainey closed 1 week ago
❌ Failed to cleanly apply e3e96ea0ff8e2ceaae8d1e15adbfda9c3964def8 on top of patchback/backports/3.26/e3e96ea0ff8e2ceaae8d1e15adbfda9c3964def8/pr-3627
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_rpm.git
$ git fetch upstream
$ git checkout -b patchback/backports/3.26/e3e96ea0ff8e2ceaae8d1e15adbfda9c3964def8/pr-3627 upstream/3.26
$ git cherry-pick -x e3e96ea0ff8e2ceaae8d1e15adbfda9c3964def8
If it'll yell at you with something like fatal: Commit e3e96ea0ff8e2ceaae8d1e15adbfda9c3964def8 is a merge but no -m option was given.
, add -m 1
as follows instead:
$ git cherry-pick -m1 -x e3e96ea0ff8e2ceaae8d1e15adbfda9c3964def8
$ git push origin patchback/backports/3.26/e3e96ea0ff8e2ceaae8d1e15adbfda9c3964def8/pr-3627
🤖 @patchback I'm built with octomachinery and my source is open — https://github.com/sanitizers/patchback-github-app.
❌ Failed to cleanly apply e3e96ea0ff8e2ceaae8d1e15adbfda9c3964def8 on top of patchback/backports/3.25/e3e96ea0ff8e2ceaae8d1e15adbfda9c3964def8/pr-3627
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_rpm.git
$ git fetch upstream
$ git checkout -b patchback/backports/3.25/e3e96ea0ff8e2ceaae8d1e15adbfda9c3964def8/pr-3627 upstream/3.25
$ git cherry-pick -x e3e96ea0ff8e2ceaae8d1e15adbfda9c3964def8
If it'll yell at you with something like fatal: Commit e3e96ea0ff8e2ceaae8d1e15adbfda9c3964def8 is a merge but no -m option was given.
, add -m 1
as follows instead:
$ git cherry-pick -m1 -x e3e96ea0ff8e2ceaae8d1e15adbfda9c3964def8
$ git push origin patchback/backports/3.25/e3e96ea0ff8e2ceaae8d1e15adbfda9c3964def8/pr-3627
🤖 @patchback I'm built with octomachinery and my source is open — https://github.com/sanitizers/patchback-github-app.
fixes #3620.
(cherry picked from commit 1c36b39e2be24f87a97821370ee850cafefddbe6)