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

[Tamas Szekeres]

Hi Tom,

I think this is the latest document it this topic:
https://github.com/mapserver/mapserver/wiki/WorkingWithGit

I don't think if stablemerge.sh is up to date at the moment, however.

Best regards,

Tamas


Tom Kralidis <tomkralidis at gmail.com> ezt írta (időpont: 2018. okt. 22., H,
18:12):

> 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osgeo.org/pipermail/mapserver-dev/attachments/20181022/10ede9d3/attachment.html>