Yes, master is merged into the feature branches before going upstream. We consider it to be the responsibility of the feature branch owner to make sure their co

Yes, master is merged into the feature branches before going upstream. We consider it to be the responsibility of the feature branch owner to make sure their code will work with master. Because we don't care about the commits on the feature branches, we prefer doing a regular merge, not a rebase of the feature branch, so that there's no need for force pushing at any point. We consider a force push of any kind to be unnecessarily dangerous. The tool will handle the merge up for you, but if there are conflicts you'll have to resolve them before you can release the feature.