AS-88 commit.sh: --merge option and dev-branch checking