branch
master
commit another one
fdkjd
Merge branches 'master' and 'my_new_branch'