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

[Jeff McKenna]

On 2018-10-22 4:41 PM, Even Rouault wrote:
> 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
> 

As I was saying to Tom, I think it's important to not submit 
changes/pull requests into multiple branches at once, as this will just 
cause chaos/confusion for when the release managers checks this (and 
have to run the commands that Even listed here).  -jeff