s3_bucket transfer accleration #2046
Merged
Patchback / Backport to stable-8
completed
Jun 28, 2024 in 24s
Backport to stable-8: 💔 cherry-picking failed — conflicts found
❌ Failed to cleanly apply 3a6e448 on top of patchback/backports/stable-8/3a6e448a93a24c474d281aa49492a3903b662ef7/pr-2046
Details
Backporting merged PR #2046 into main
- Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be yourorigin
remote. - Make sure you have an upstream repo added as a remote too. In these
instructions you'll refer to it by the nameupstream
. If you don't
have it, here's how you can add it:$ git remote add upstream https://github.com/ansible-collections/amazon.aws.git
- 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/stable-8/3a6e448a93a24c474d281aa49492a3903b662ef7/pr-2046 upstream/stable-8
- Now, cherry-pick PR #2046 contents into that branch:
If it'll yell at you with something like
$ git cherry-pick -x 3a6e448a93a24c474d281aa49492a3903b662ef7
fatal: Commit 3a6e448a93a24c474d281aa49492a3903b662ef7 is a merge but no -m option was given.
, add-m 1
as follows instead:$ git cherry-pick -m1 -x 3a6e448a93a24c474d281aa49492a3903b662ef7
- At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR #2046 as close to the
original as possible. - Push this branch to your fork on GitHub:
$ git push origin patchback/backports/stable-8/3a6e448a93a24c474d281aa49492a3903b662ef7/pr-2046
- 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!
Loading