[mapserver-dev] Backport bot no longer working

[Jeff McKenna]

I just got an error with cherry-pick ("..is a merge, missing -m 
parameter") so instead I went into the branch-7-4, and checked out the 
specific file from master, which brings in the changes:

   git checkout origin/master mapscript/phpng/php7module.i

Then commit as usual.

I'm sure there's a fancier way, but that's how I did it manually.

-jeff



On 2019-12-06 11:35 AM, Steve Lime wrote:
> What's the proper command sequence to cherry pick from and to master? I 
> don't want to screw this up.
> 
> On Sun, Nov 24, 2019 at 7:58 AM Even Rouault <even.rouault at spatialys.com 
> <mailto:even.rouault at spatialys.com>> wrote:
> 
>     Hi,
> 
>     just wanted to share this info. Affects other friend projects as well
>     See https://github.com/OSGeo/PROJ/issues/1741 for a few details
> 
>     Pending a potential future resolution, the old-school backporting
>     method with
>     "git cherry-pick" should be applied
> 
>     Even
>