git branch - How to partly merge branches in git -
i have 2 branches in project:
master | develop ------ | ------- abcd | bcda7 | bcda6 | bcda5 | bcda4 | bcda3 | bcda2 | bcda1 how can partly merge branches? let's merge commits bcda2 - bcda4 master (i don't need merge commit bcda1), merge commits bcda5-7 master?
i know how utilize git-cherry-pick don't wanna utilize creates new commits , there mess in future merging branches. i'd retain current commits ids , partly merge branches.
i tried utilize
git rebase -i i removed lines pick bcda5 - pick bcda7 hence merged branches removed commits bcda5-bcda7 completely.
could please advise on how correctly?
git git-branch git-cherry-pick
No comments:
Post a Comment