So GitHub has an option we can enable which gives ...
# developmentb
bitter-ability-32190
05/11/2023, 8:29 PMSo GitHub has an option we can enable which gives people a one-button "Merge latest
mainmain✅ 1
bitter-ability-32190
05/11/2023, 8:29 PMOtherwise it's a manual process and I have to leave comments like this: https://github.com/pantsbuild/pants/pull/18935#issuecomment-1544634479
w
witty-crayon-22786
05/11/2023, 9:59 PMthe wording is a bit weird… this isn’t going to suggest that it is actually necessary to rebase, is it?
b
bitter-ability-32190
05/11/2023, 10:20 PMNo it isn't necessary. We have it on at work
bitter-ability-32190
05/11/2023, 10:21 PMSome people do click it because they don't know better, so remote caching is ideal
h
happy-kitchen-89482
05/11/2023, 11:48 PMI'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.
w
witty-crayon-22786
05/12/2023, 1:28 AMok: turned it on.
b
bitter-ability-32190
05/12/2023, 1:31 AM🙏
c
curved-television-6568
05/12/2023, 2:33 AMthis will be something to keep in mind though: don’t merge on release branches!
w
witty-crayon-22786
05/12/2023, 2:35 AMhm… for a release branch PR, the “base” branch should be the destination. which PR is this?
c
curved-television-6568
05/12/2023, 2:39 AMBenjy’s release prep for 2.16.0rc2
w
witty-crayon-22786
05/12/2023, 2:39 AMyea, that one is bound for
main👍 1
c
curved-television-6568
05/12/2023, 2:39 AMoh, right.
curved-television-6568
05/12/2023, 2:41 AMshould be cool then.. 😅