Merging a branch of a branch after first branch is squashed when merged to master Merging a branch of a branch after first branch is squashed when merged to master git git