-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Michael,
On 2/24/20 14:15, Michael Osipov wrote: > Am 2020-02-24 um 17:33 schrieb Christopher Schultz: >> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 >> >> All, >> >> I'm trying to cherry-pick a commit. The commit went through >> github, merged a PR from a contributor into master. I'm trying to >> cherry-pick it back into the 9.0.x branch: >> >> $ git cherry-pick f124a9c7230227d3eaff9d2dc1c52f82ce10e03f error: >> commit f124a9c7230227d3eaff9d2dc1c52f82ce10e03f is a merge but no >> -m option was given. fatal: cherry-pick failed >> >> ?? >> >> My local copy is all up-to-date, no weird local changes or >> anything like that. What is a "merge", here? Supplying "-m" >> doesn't like the commit id. > >> $ git log --graph * commit >> 900ed3ef96080ec378fea452dcd748bf3bfa0ec0 (HEAD -> master, >> origin/master, origin/HEAD) | Author: Christopher Schultz >> <ch...@christopherschultz.net> | Date: 2020-02-24 17:26:31 >> +0100 | | Add changelog entry. | * commit >> f124a9c7230227d3eaff9d2dc1c52f82ce10e03f |\ Merge: 03b2af7473 >> bf2447b4bd | | Author: Christopher Schultz >> <ch...@christopherschultz.net> | | Date: 2020-02-24 17:21:31 >> +0100 | | | | Merge pull request #240 from ThStock/master | >> | | | Added extension point for custom delta requests | | | * >> commit bf2447b4bd9edda25e00c7aaab9fcce455c43f2f | | Author: >> Thomas Stock <tst...@novomind.com> | | Date: 2020-02-13 >> 12:55:32 +0100 | | | | Added extension point for custom delta >> requests | | > > You can't cherry-pick merge commits. WTF is a merge-commit? > Try to avoid merge commits. I clicked "Merge PR" in GitHub. I don't believe I had any choices in the matter. > In most cases all they do is to add clutter with zero benefit [1]. Single-click to accept a PR is great. I see that is CAN cause (me) problems, but it shouldn't be this hard. > Rebase the branch you want to merge on top of the targer branch, > switch and then merge. I don't control the source's github fork, so that's a no-go. > This is trivial via shell. Other than clicking "Merge PR" in github, I do everything via CLI. - -chris -----BEGIN PGP SIGNATURE----- Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/ iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl5UM38ACgkQHPApP6U8 pFiBtw//Yq9O6JwZyECcNZxT+nSaXu8ih1TQd5d9X89PnMEoi/1TX1e/3destk/A FoZr1Q6X/jOr3wnwDEVv6BbWaDwli6lR2swZDjENi2UeyqUTVHPmSV/q5cj5VOjs 5At7HjOA2FPQJ7oEfw7NSqKs20a4qFhtjJ+CfosfrsbQzTe6fBo9uSAgOXxzAsm+ +IZzCv1moj7037ps0UrmBkWEiwb2zRRj7rqtaZS+M/zUr10WItH2Qpb7RphExcdm 2RDbJjNYWHVDUYOjHAVrPEUiw83gxpOnH3dqJwoXqdtDLkbtLA5xNhmxg+o/MWlN 2S5d1739vBrTZFowXS0aGyZNH3rFTqO9jKsv8LIhBBIA2iioGw7gu3tU+OSI0fZR Ad039m48FfjSRtQKO+Ne03+vOBp64grG4B9KaloAhzt86bb/jlsZYf21M4bcwVVW zqjMy6FyUqnWPVYRW0V6f59b/OH3ZcBAjj2MYBF+r6OscrS7m//Tm8aEEysksZbF orBj6n80XNGwn4jJYFW4W4MMVSTED5uUh38irnIiObK7zdIriWeARouktxumOT2d faA6Ozf5ZIXxJdbafbSnOeX+/XnoiupPHpR7/hRhc3aHlz0gbIBHzPIzTi+nYma1 L/s7vmvbjDpZZNzAsUncAwt+H1PxD22Xa5gWN+aSpuijPlIQbnM= =6LUI -----END PGP SIGNATURE----- --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
