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

[David van der Spoel]

On 2013-11-26 09:05, Berk Hess wrote:
> 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
>
What's wrong with merge?

Cherry pick is more for the other way around IIRC.

-- 
David van der Spoel, Ph.D., Professor of Biology
Dept. of Cell & Molec. Biol., Uppsala University.
Box 596, 75124 Uppsala, Sweden. Phone:	+46184714205.
spoel at xray.bmc.uu.se    http://folding.bmc.uu.se