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

[Mark Abraham]

Works fine for me. Make sure git is a recent version, and that both
branches are present in the repo. Git needs the full history in order to
observe the move.

Mark
On Nov 26, 2013 9:06 AM, "Berk Hess" <hess at kth.se> 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
>
> --
> Gromacs Developers mailing list
>
> * Please search the archive at http://www.gromacs.org/
> Support/Mailing_Lists/GMX-developers_List before posting!
>
> * Can't post? Read http://www.gromacs.org/Support/Mailing_Lists
>
> * For (un)subscribe requests visit
> https://maillist.sys.kth.se/mailman/listinfo/gromacs.org_gmx-developersor send a mail to
> gmx-developers-request at gromacs.org.
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://maillist.sys.kth.se/pipermail/gromacs.org_gmx-developers/attachments/20131126/01c651e9/attachment.html>