[gmx-developers] porting a commit from 4.6 to master

[Berk Hess]

Hi,

I have a commit on top of release-4-6 and want to also have it on top of 
master. Doing git cherry-pick results in conflicts for all files, since 
all files have been moved.
Is there a way to port the commit and have git resolve the file movement 
automatically?

Cheers,

Berk