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.
Try to avoid merge commits. In most cases all they do is to add clutter
with zero benefit [1]. Rebase the branch you want to merge on top of the
targer branch, switch and then merge.
This is trivial via shell.
[1]
http://lists.llvm.org/pipermail/llvm-dev/2019-January/129723.html?source=techstories.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
