add commit-merge.txt
add commit-rebase.txt
Merge branch 'feature-branch-merge'
Merge branch 'feature-branch-rebase'