пн, 24 февр. 2020 г. в 19:40, Emmanuel Bourg <ebo...@apache.org>: > > Le 24/02/2020 à 17:33, Christopher Schultz a écrit : > > > Any ideas? > > I guess you are cherry picking the merge commit, instead of the actual > commit(s) from the PR branch. >
https://github.com/apache/tomcat/commit/f124a9c7230227d3eaff9d2dc1c52f82ce10e03f says: "2 parents 03b2af7 + bf2447b" I guess that you want this commit: https://github.com/apache/tomcat/commit/bf2447b4bd9edda25e00c7aaab9fcce455c43f2f I am not fluent with command-line for this command, as I usually do it via GUI (provided by TortoiseGit). "git help cherry-pick" may help you. Best regards, Konstantin Kolinko --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
