I think rebase is fine, you just need to synchronise with the people working with you on the branch. There shouldn't be more than 1 or 2, otherwise you're proba

I think rebase is fine, you just need to synchronise with the people working with you on the branch. There shouldn't be more than 1 or 2, otherwise you're probably doing something wrong. Also, I only rebase when it makes sense in that case, you need something from master or you're about to merge back into master, so disruption should be minimal.