-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 All,
I tried again to commit to tc10 branch, got commit id 8dddc11512fbd3b91ed9d737a42e4b8415458ddf. Moving to tc9 branch: $ git cherry-pick -n 8dddc11512fbd3b91ed9d737a42e4b8415458ddf fatal: bad object 8dddc11512fbd3b91ed9d737a42e4b8415458ddf - From tc10: $ git remote -v origin https://github.com/apache/tomcat (fetch) origin https://github.com/apache/tomcat (push) - From tc9.0.x: $ git remote -v origin https://github.com/apache/tomcat (fetch) origin https://github.com/apache/tomcat (push) My 9.0.x local is all up-to-date with github, and github can see the commit in tc10. Other than manually handing the diffs myself, I have no idea what to do, next. :( - -chris On 2/24/20 11:33, Christopher Schultz wrote: > 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/ iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl6nWssACgkQHPApP6U8 pFgE0RAAkCCN0ai+byJh3TGyQRWGP1WTUc92UO7kbVCFiJTe/1s6XtUOwPguiJ87 rbIAZRsKDefVJVZguad6mXQEkQEnAXQF3w5TvLt8abGbOKi1z4UG+ONwHdptwQfZ 83vIexa4mV2yw45mpTPqYIZ16eke41x+YV1cZea0iEqp7eQ12HN71je7E0HzEGFN lDCf+sBHGjBeJ63LSsZ/hIU+LoWgmGBmc0j9GK1UlsL0LhpH6Cz/dXoyqsCxIXl4 3BIP5FmSK+3d+f5ciVUrAQJCH6SF0yYEx4+JtUVIUl1lJN5OwvZsyhnHHX4OqiHg Qp0Zx7h8+mj83MAwZDDyyNcABoF4hyrEMoS9w/I2+zCNrs7RGZGKqvZRIwR2IhCR rdhfTisc9nkmwZhg+Yt485l0m/IOO/XNqijZ8O4oxUz14BmDHrUoIYlnT3BEKe4q 7roZpz78JmcCDlFDkEcvaZKJ68vww0CFZsoWXTGDCZuckJQaAOz6Jf9470g2Y79/ WHtxmBtLNimexrbLN4COYsVoPQbk1X1xGhi2fYqyMNjVGV2cqdOo2I+VAurfRhnh wpoLzN2mNh0qi23pdyrRsSyRB/KdAszVa2fjIR7WD74AamNy/CzMrydx0b2OpB8k UbQ/uRuFR7q7jm5N2d0fELMWRPV03RcQ9iIFxtvPE0kGLLvyjm4= =LDJJ -----END PGP SIGNATURE----- --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
