[appng] Running shell script + git merge --ff appng-1.18.x --strategy-option theirs merge: appng-1.18.x - not something we can merge Did you mean this? origin/appng-1.18.x