branch-2-commit
Merge branch 'branch-2' into branch-of-branch-1