Reputation: 299
merged feature/fix
to develop
. My collegue after this merge make three commits to feature/fix
.
How to apply these three commits on develop ?
I know cherry-pick, however I am searching for other solution. Thanks
Upvotes: 0
Views: 60
Reputation: 187
Switch to branch 'develop'
git checkout develop
merge commits of feature fix to develop:
git merge feature/fix
Upvotes: 4