Answer the question
In order to leave comments, you need to log in
How to merge only branch changes, but not ancestors?
There is roughly the following commit history:
C7---C8 #release_v2
/
/
C1---C2---C5---C6--- #dev
\ /
\ /
C3--C4 #my_super_feature
Answer the question
In order to leave comments, you need to log in
if it’s not clear what will go into the next release, you need to start all the features from one commit.
but I would do it differently:
make a feature branch from #dev, sausage the feature as it is ready - rebase it to the edge of #dev, review the code, (then optionally sqash the whole feature to 1 commit), merge to #dev. Then another, and another. Testing-shmesting, how everything calmed down, from this place in #dev you make a separate #release branch or rebase here the branch with which you make releases or just put a tag.
the release has passed, what feature is completed, you rebase it to the edge of #dev and everything is in a circle.
with this approach, you can clearly see what will get into the release (since it has already been completed and is in #dev)
then please advise how else to organize the branches ...
Didn't find what you were looking for?
Ask your questionAsk a Question
731 491 924 answers to any question