Hi, I have an use case where I need to cherry pick a change from one branch to another. The change will apply cleanly but the files in the branch where I want to cherry pick the co mit to have been moved under a different directory. So simple cherry pick will result in conflicts. Is there a clean way to cherry pick in this case? Is there an option to provide -p0, -p1 etc to the patch? Thanks Ani