Commit any conflicts during v1 backport to simplify release process#1032

henrymercer merged 6 commits intomaingithub/codeql-action:mainfrom

henrymercer/handle-merge-conflicts-in-releasesgithub/codeql-action:henrymercer/handle-merge-conflicts-in-releasesCopy head branch name to clipboard