merge script: --squash, --ff from unborn branch are errors