piyo.txtを作成
Merge branch 'feature/piyo'
hoge_sub.txtを作成
hoge.txtを追加
Merge branch 'feature/hoge_sub' into feature/hoge