Should we "Require branches to be up to date before merging"?

[akaszynski]

In our branch protection settings we have "Require branches to be up to date before merging" enabled. While theoretically I think this is a great practice, in reality it's a bit annoying to require this especially given the number of PRs that are sometimes open at once.

I recommend disabling it unless issues arise. Git will at least complain about merge conflicts before any merge, which effectively just leaves edge cases of side effects as the two most likely negative post-merge issues.

[germa89]

LGTM.

[germa89]

I just changed that option.

[akaszynski]

I changed it back. You can change it back again when you come back from your holiday. Americans don't get holidays. Or weekends. Or evenings.