4 ms·
I know git internals. But I still struggle to have a correct mental model of developping features on branches that you then merge into a very distant branch. I
by lolive 6y ago
I know git internals. But I still struggle to have a correct mental model of developping features on branches that you then merge into a very distant branch.
It is ok when you create a branch from develop, code your feature and merge back to develop.
But then things get messy: you need to backport that feature to some release branches.
And all that is asynchronous (backport feature « n+1 » but not feature « n » nor « n-1 » from develop onto branch 1.0 LTS and branch 2.0-SNAPSHOP. ok done? Perfect, let’s ship that. Good feedback from users? Ok cool. Now do the same with « n-1 »)
you want to keep track of code movements between branches, so you use merge (not rebase or cherry-pick).
Pffffiou I honestly do not know how to handle that at scale with Git.