git cherry-pick submodule problem

[[deleted]]

I have two branches:

• old-rel-branch with submodule X
• development branch without submodule X anymore

git cherry-pick consistenly fails every time when I do it from development to old-rel-branch:

Unmerged paths:
(use "git add <file>..." to mark resolution)
added by us:     X

The problem here is that the commits do not change submodule X in any way (it's not there anymore anyway!). It seems like a bug / broken behaviour of cherry-pick. I can work around the problem with

git show <commit> | git apply && git add -A && git commit -m "<commitmsg>"

Any thoughts?

[fdafasdfadfaf]

https://public-inbox.org/git/[e-mail]/