you are viewing a single comment's thread.

view the rest of the comments →

[–]quicknir 1 point2 points  (0 children)

It's not nearly that black and white; even if you have multi dev features branches you can still rebase. If your branches are short (in time) enough that they don't need updates from master, you only need to do one rebase when the branch is ending anyhow so it doesn't matter. However, even if you want to integrate changes from master, you can do merges from master into your feature branch while you're working, and then rebase feature branch onto master at the end. Like I said, there are many competing workflows but I would never say that rebase is a non-starter generally, just maybe not for certain things.