Git rebase branch with merged children

Question

Today I faced with one problem. My teammate created branch from master. He developed one feature in this branch and after that developed two subfeatures in subfeature\'s branche

Answer 1

Did you cherrypick every commit one by one by hand?

Just run git rebase -i master feature and rewrite the history as you please.