[mapserver-dev] MapServer upstream git merges...

[Even Rouault]

On lundi 22 octobre 2018 16:41:52 CEST Lime, Steve D (MNIT) wrote:
> Hi guys: I'm I crazy or were there mechanisms in place to automatically
> merge changes in branches upstream - so a change to branch-7-0 would
> automatically be merged into branch-7-2 and master? --Steve

"Automatically" for an operation where human assistance might be needed isn't 
the appropriate word, but here's the procedure I just applied

git checkout branch-7-2
git pull origin branch-7-2
git checkout master
git pull origin master
git merge branch-7-2  : solve conflicts (often CMakeLists.txt)
git add CMakeLists.txt (if modified)
git commit -a (if merge conflicts)
git push origin master

-- 
Spatialys - Geospatial professional services
http://www.spatialys.com