'git merge --squash' scaffold branch into develop branch