[mapserver-dev] Pull requests to master or branch-7-2?

Even Rouault even.rouault at spatialys.com
Fri Aug 17 14:38:17 PDT 2018

On vendredi 17 août 2018 23:08:05 CEST Seth G wrote:
> Hi devs,
> Should new pull requests be made to master or the 7-2 branch?

But fixes that apply to 7-2 should go against to 7-2

> I believe it should be on the 7-2 branch according to
> https://github.com/mapserver/mapserver/wiki/WorkingWithGit and then there
> is a script that applies these to master? There are a few changes in the
> 7-2 branch that aren't in master, so I'm not sure how/when this process
> takes place.

Wasn't aware of that script, and it appears to be outdated referencing old 

Just manually resynced master with 7.2 with:

git checkout branch-7-2
git pull origin
git checkout master
git pull origin
git merge branch-7-2
git push origin master


Spatialys - Geospatial professional services

More information about the mapserver-dev mailing list