-----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. Any ideas? - -chris -----BEGIN PGP SIGNATURE----- Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/ iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl5T+t8ACgkQHPApP6U8 pFjwvRAAnaog8gRDB+vajg0CCXYmCvq24yO5FZNbcQSQCyTLM7WnIfFUCYanI+VG hnSdmWcqyv2P/zHij67EyO+TmrPIqI6WLv5/xOIMHH6JYZK3eebpofwrIAoxJ5je xM1shwvjXYss7LNs5uxVThmWg3z5KGjGX9VuQVtaROx4LvAYWPQ+ajld/KXU5qha R7ytbDD96bgty7iiScaG7cPHYZryq3ePnhphR7nYp1RhHXUkdB//nc2PmS5166MU NZtxbCF28T55wXifJV5ZCodHs2tJh+zu9LeYP9hgUkoAQedJ8fSMk4DnKz+RCFXB huVArT0kuy5t2FoSweNpI9NpzoHRxnleGPsqJv20g9CcVzJqCLisyyLCxP1YUuNI te3rtjKUY0aegTE4DbVpQg49iblnsAJyVhMQIkOhKcciM3P2ZNNOVvuiNhNzPaV+ U/uR9tB8+e0XQX5ONt1Q1L6/u4dYTuXgFRkWU0K4b1eIjfsicECgOq5lcKUlxlIe Jl3rJx8FAZpR6AiHUoJy7tujd6/SIoSOCg9BWmfj8I2pslKpY1nFxfhSF9bhcsr3 fSPcjUZyGpZqjzgxXi2jA2XjJgqaMoyWkscRavLNv9jWKLtUNUPmpNCKPRW07HCc hA9Fvukuq6c7Sjy9y+ZH8in7lbGtdcBYhm8+BQhbJimyLn377DI= =Fx8W -----END PGP SIGNATURE----- --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
