Hi,
today I’ve backporter pr/302 (the scale hint controls for WMS 1.1 caps) and had to
figure out a way to merge on 2.4.x the many commits the pull request was composed
of.
For “sane” pull requests I normally just cherry-pick (1-3 commits) but this one had a dozen.
I found out a nice way to do the backport is to get a git patch out of github, adding .patch
to the pull request address, like this:
https://github.com/geoserver/geoserver/pull/305.patch
And then use “git am 305.patch”, which behaves more or less like a rebase, applying
each patch in turn and stopping for amends in case of conflicts.
Hopefully it will be useful to someone else too.
Cheers
Andrea
–
==
Our support, Your Success! Visit http://opensdi.geo-solutions.it for more information.
Ing. Andrea Aime
@geowolf
Technical Lead
GeoSolutions S.A.S.
Via Poggio alle Viti 1187
55054 Massarosa (LU)
Italy
phone: +39 0584 962313
fax: +39 0584 1660272
mob: +39 339 8844549
http://www.geo-solutions.it
http://twitter.com/geosolutions_it