[appng-manager] Running shell script + git merge --ff appng-manager-1.12.x --strategy-option theirs Merge made by the 'recursive' strategy.