So GitHub has an option we can enable which gives people a o

Question

So GitHub has an option we can enable which gives people a one button Merge latest `main` into this branch Since our classifier script requires your branch is within some static number from `main` I suggest we enable this option to make the bring to the present operation simple

bitter-ability-32190 · Answer

Otherwise it s a manual process and I have to leave comments like this <https github com pantsbuild pants pull 18935 issuecomment 1544634479>

witty-crayon-22786 · Answer

the wording is a bit weird this isn t going to suggest that it is actually necessary to rebase is it

bitter-ability-32190 · Answer

No it isn t necessary We have it on at work

bitter-ability-32190 · Answer

Some people do click it because they don t know better so remote caching is ideal

happy-kitchen-89482 · Answer

I ve been meaning to tweak the classifier script options because right now it diffs from main and so when you drift you also get more changed files than you actually edited leading to unnecessary testing on docs only changes So this would also mitigate that

witty-crayon-22786 · Answer

ok turned it on

bitter-ability-32190 · Answer

pray

curved-television-6568 · Answer

this will be something to keep in mind though don t merge on release branches

witty-crayon-22786 · Answer

hm for a release branch PR the base branch should be the destination which PR is this

curved-television-6568 · Answer

Benjy s release prep for 2 16 0rc2

witty-crayon-22786 · Answer

yea that one is bound for `main` so the message is accurate

curved-television-6568 · Answer

oh right

curved-television-6568 · Answer

should be cool then sweat smile