Git flow question, one feature branch depends on another. How should i correctly rebase the child feature branch after my parent feature branch merging to master?
The git flow is shown below: At last I got duplicate commits in my child feature branch.
Assuming you've already committed your changes on your feature branch, you can just do:
git pull origin master --rebase
From git-pull Documentation: