Yes, just rebase your whole feature branch on top of origin/master. Long-running branches with huge amounts of commits are bad anyway for multiple reasons, so i

Yes, just rebase your whole feature branch on top of origin/master. Long-running branches with huge amounts of commits are bad anyway for multiple reasons, so it's not like you're bringing too many commits at once with any given rebase. I'm not sure why you think this is worse to coordinate than merge commits? I think encouraging rebase-heavy workflow where feature branches are put into origin/master as often as possible actually improves the coordination quite a lot. When working that way, origin/master is always pretty recent, and anyone starting a new feature branch from top of it has really small risk of missing any big change sets from coworkers. On the other hand, I feel that merge-heavy workflow encourages people to have long-running branches other than origin/master, which hides commits from others.