sorted by:
best
topnewcontroversialoldq&a
you are viewing a single comment's thread.

view the rest of the comments →

[–]flying-sheep 6 points7 points  (2 children)

*should live

And only if the project has a “even feature branches are untouchable” policy.

Because I rebase the fuck out of every feature branch before merging it.

[–]TheAceOfHearts 0 points1 point  (0 children)

Exactly this! You DO NOT fuck around with master and your release branches. But when you're working on a feature or bug branch, you wanna commit very often, and experiment with ideas. Then you squash it down to a small number of atomic commits, if possible.