git-commands merge branch to trunk/master