branch from master
branch from branch
Merge branch 'branchFromBranch' into branchFromMaster
Merge branch 'branchFromMaster'