[roblabla]

Well, I routinely `git rebase upstream/master` to keep my git history clean. It has the same effect as a merge from master, but keeps everything tidy.

[draw_down]

Whenever I do this I inevitably end up with merge conflicts in stuff I absolutely didn't touch. I don't know if it's because it's a monorepo with lots of people committing, or what, but it basically never works cleanly. It's very frustrating, particularly because merging master works without a hitch. So I just do that instead.

[emodendroket]

And also will make a huge mess if someone else has checked out your code already.

[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.