Rebase shears/main: 5 conflict(s) (0 skipped, 5 resolved) (#29699723355)#321

gitforwindowshelper[bot] wants to merge 343 commits into

base/shears/main-29699723355git-for-windows/shears-builds:base/shears/main-29699723355from

shears/main-29699723355git-for-windows/shears-builds:shears/main-29699723355Copy head branch name to clipboard