[mapserver-dev] merge strategy between master and stable branch

[Lime, Steve D (MNIT)]

There are scripts that merge upstream (I believe Thomas and Even setup originally) on a regular basis (daily I believe). I'll look for the docs... So basically you make your changes to the appropriate branch and then they propagate automatically.

-----Original Message-----
From: mapserver-dev [mailto:mapserver-dev-bounces at lists.osgeo.org] On Behalf Of Tom Kralidis
Sent: Monday, October 22, 2018 11:12 AM
To: mapserver-dev at lists.osgeo.org
Subject: [mapserver-dev] merge strategy between master and stable branch

Hi all: I recently pushed some fixes to branch-7-2 and asked whether/how merging to master is being done.  See Jeff M's comments at [1] and irc convo at [2].

Is the expectation that the release manager will merge branch fixes into master at some point?  Is there a process to do so?  As a committer I am just following through to ensure my fixes are both in stable branch and master.

Sorry if this is already discussed / documented (if yes, is there a link somewhere)?

Thanks

..Tom

[1] https://github.com/mapserver/mapserver/pull/5684#issuecomment-431430953

[2] http://irclogs.geoapt.com/mapserver/%23mapserver.2018-10-22.log
> 
_______________________________________________
mapserver-dev mailing list
mapserver-dev at lists.osgeo.org
https://lists.osgeo.org/mailman/listinfo/mapserver-dev