Add make merge-main target and align merge guidance docs#35191

pelikhan merged 4 commits into

maingithub/gh-aw:mainfrom

copilot/add-merge-main-targetgithub/gh-aw:copilot/add-merge-main-targetCopy head branch name to clipboard