Topic Branches

[bpieber]

Dale, you suggest we use topic branches. They seem to be feature branches which are argued against here. I tend to agree. What do you think?

[dalehenrich]

The important point for me is that the development is done on a branch separate from the mainline... it can be called whatever you like...

He doesn't argue about whether each developer should be doing development on a separate branch...his point seems to be how often integration occurs ... and I don't disagree with the notion of frequent integration ...

So we want to do development on separate branches, but we also want to make sure that we integrate frequently ...

As I think about this it is okay to have 1 long-lived branch that does not merge to the mainline frequently (it should be merging from the mainline frequently), but to have two long-lived branches is certain death:)