[mbrock]

Is it really such a huge mess? They'll get a conflict if they try to pull, and then they simply have to rebase their changes onto your new rebased branch, right?

[emodendroket]

I don't put that much faith in everybody else to figure it out themselves.

[user5994461]

It's part of the git workflows.

Everybody merge OR every rebase. The organization gotta decide on the workflow.