> Also what solution do you use when you are sharing your feature branch with other people (especially with 1-2 other programmers) while still rebasing off mast

> Also what solution do you use when you are sharing your feature branch with other people (especially with 1-2 other programmers) while still rebasing off master? We don't have that problem because we keep topic branches personal (but still public so they can be reviewed). In other words, our topic branches branch off from master, we don't branch off of someone's topic branch to build a new feature on top of it while the current feature is still ongoing. We try to make branches short-lived and break larger tasks into small parts that can ship individually.