Re:Continuous Integration and Feature Branching
by kazinator on Tuesday April 10, 2018 @01:38AM
(#16799239)
> The longer that you defer feedback, the greater the risk that something unexpected, and usually bad, will happen.
Though, for Pete's sake, at least wait until all the modules of the program are presented for linking before having a fit about an undefined function. :)
> Feature Branching is very nice from the perspective of an individual developer, but sub-optimal from the perspective of a team.
Feature branching, from the perspective of a an individual developer, is almost invisible with a tool like a Git. Your local tracking branch is your feature branch. You develop your commits on it, rebase it and submit it. (Perhaps to a review system like Gerrit, if not directly). That's a one-developer feature branch in disguise.
An actual non-invisible feature branch is a remote one shared by two or more developers.
> I work on Trunk, “master” in my GIT repos. I commit to master locally and push immediately, when I am networked, to my central master repo where CI runs. That’s it!
No, you work on a local branch which just tracks the remote "origin/master" one (or whatever your upstream repo is called, not necessarily "origin"). When that local branch is created, it by default gets the name "master" so it's easy to pretend you're working on the master. That's what I mean by "almost invisible".
Though, for Pete's sake, at least wait until all the modules of the program are presented for linking before having a fit about an undefined function. :)
> Feature Branching is very nice from the perspective of an individual developer, but sub-optimal from the perspective of a team.
Feature branching, from the perspective of a an individual developer, is almost invisible with a tool like a Git. Your local tracking branch is your feature branch. You develop your commits on it, rebase it and submit it. (Perhaps to a review system like Gerrit, if not directly). That's a one-developer feature branch in disguise.
An actual non-invisible feature branch is a remote one shared by two or more developers.
> I work on Trunk, “master” in my GIT repos. I commit to master locally and push immediately, when I am networked, to my central master repo where CI runs. That’s it!
No, you work on a local branch which just tracks the remote "origin/master" one (or whatever your upstream repo is called, not necessarily "origin"). When that local branch is created, it by default gets the name "master" so it's easy to pretend you're working on the master. That's what I mean by "almost invisible".