git branches confusion, pushing branch_n to master