Hi, On Sat, 11 Apr 2020 at 14:24, Ani Sinha <ani@xxxxxxxxxxx> wrote: > On Apr 11, 2020, 17:51 +0530, Martin Ågren <martin.agren@xxxxxxxxx>, wrote: > > > On Sat, 11 Apr 2020 at 13:33, Ani Sinha <ani@xxxxxxxxxxx> wrote: > > > > 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? > > > > I just tried the following commands. Admittedly, this example is a bit > > silly, but at least for me, Git does handle the move just fine. Does > > this work for you? > > > > mkdir test > > cd test > > git init > > mkdir olddir ... > > git mv olddir newdir ... > > What kind of conflicts do you get in your real-world use case? > My usecase is slightly different. The files I want to patch has been > moved under a new subdirectory which is under the original root > directory. So in order to patch, I need to add a new prefix to the patch > manually. I'm not able to fully guess your situation from this, but I wonder about one thing: Do you use "git cherry-pick", "git am" or "git apply"? (Or something else entirely?) Are you aware of "-p<n>" for "git apply" (and "--directory=<root>"?) and are wondering what similar options are available with "git cherry-pick"? I still don't fully understand what you're doing and what you're seeing, so it's hard to get a good picture of the problem. I'm about to leave, so if I stay silent for several hours, that's why. :) Martin
