René's URL Explorer Experiment


Title: Fix merge conflict handling in the rebuild workflow by henrymercer · Pull Request #4191 · github/codeql-action · GitHub

Open Graph Title: Fix merge conflict handling in the rebuild workflow by henrymercer · Pull Request #4191 · github/codeql-action

X Title: Fix merge conflict handling in the rebuild workflow by henrymercer · Pull Request #4191 · github/codeql-action

Description: Actions for running CodeQL analysis. Contribute to github/codeql-action development by creating an account on GitHub.

Open Graph Description: The rebuild workflow is meant to continue when merging the base branch only conflicts in lib, since rebuilding regenerates it. Since #3568, any conflict has failed the merge step instead, for examp...

X Description: The rebuild workflow is meant to continue when merging the base branch only conflicts in lib, since rebuilding regenerates it. Since #3568, any conflict has failed the merge step instead, for examp...

Opengraph URL: https://github.com/github/codeql-action/pull/4191

X: @github

direct link

Domain: github.com

react-profiling0
react-import-mapreact,react-dom,react-dom/client,react-dom/profiling,react-is,react-reconciler,react/compiler-runtime,react/jsx-dev-runtime,react/jsx-runtime,scheduler@d5750093facf
route-pattern/_view_fragments/voltron/pull_requests/show/:user_id/:repository/:id/pull_request_layout(.:format)
route-controllervoltron_pull_requests_fragments
route-actionpull_request_layout
fetch-noncev2:9fbdcfdc-8c7b-e5c4-409e-b8959997ea7f
current-catalog-service-hashae870bc5e265a340912cde392f23dad3671a0a881730ffdadd82f2f57d81641b
request-idBCB4:1C7D35:5F8A7A:7F54D5:6AED1CA9
html-safe-nonce9d2ee64124ed5305665ba881b8f278a3aeb73f1f5802daf93358cca41583eb86
visitor-payloadeyJyZWZlcnJlciI6IiIsInJlcXVlc3RfaWQiOiJCQ0I0OjFDN0QzNTo1RjhBN0E6N0Y1NEQ1OjZBRUQxQ0E5IiwidmlzaXRvcl9pZCI6Ijc0NTE4MzMwMTU1NzU4NDYwNTciLCJyZWdpb25fZWRnZSI6ImlhZCIsInJlZ2lvbl9yZW5kZXIiOiJpYWQifQ==
visitor-hmac58e851ef0521bae5168ec30d86f93c1cb123080fa3e8947775654eacff7c18b2
hovercard-subject-tagpull_request:4718471957
github-keyboard-shortcutsrepository,pull-request-list,pull-request-conversation,pull-request-files-changed,copilot
google-site-verificationApib7-x98H0j5cPqHWwSMm6dNU4GmODRoqxLiDzdx9I
octolytics-urlhttps://collector.github.com/github/collect
analytics-location///voltron/pull_requests_fragments/pull_request_layout
fb:app_id1401488693436528
apple-itunes-appapp-id=1477376905, app-argument=https://github.com/_view_fragments/voltron/pull_requests/show/github/codeql-action/4191/pull_request_layout
twitter:imagehttps://opengraph.githubassets.com/2360eee10b14859e70d943a901d6cebeecc9e7e654e91b6107063a95801acafa/github/codeql-action/pull/4191
twitter:cardsummary_large_image
og:imagehttps://opengraph.githubassets.com/2360eee10b14859e70d943a901d6cebeecc9e7e654e91b6107063a95801acafa/github/codeql-action/pull/4191
og:image:altThe rebuild workflow is meant to continue when merging the base branch only conflicts in lib, since rebuilding regenerates it. Since #3568, any conflict has failed the merge step instead, for examp...
og:image:width1200
og:image:height600
og:site_nameGitHub
og:typeobject
og:author:usernamehenrymercer
hostnamegithub.com
expected-hostnamegithub.com
None120085d0bcec1f427e3ab45302c8b95f873d26ad21984dc86d62ab2c10158f41
turbo-cache-controlno-cache
go-importgithub.com/github/codeql-action git https://github.com/github/codeql-action.git
octolytics-dimension-user_id9919
octolytics-dimension-user_logingithub
octolytics-dimension-repository_id259445878
octolytics-dimension-repository_nwogithub/codeql-action
octolytics-dimension-repository_publictrue
octolytics-dimension-repository_is_forkfalse
octolytics-dimension-repository_network_root_id259445878
octolytics-dimension-repository_network_root_nwogithub/codeql-action
turbo-body-classeslogged-out env-production page-responsive
disable-turbofalse
browser-stats-urlhttps://api.github.com/_private/browser/stats
browser-errors-urlhttps://api.github.com/_private/browser/errors
releasee12fd03aa775dceadc5a793c3a0791e43ca256bb
ui-targetfull
theme-color#1e2327
color-schemelight dark
react-app-namepull-requests

Links:

Skip to contenthttps://github.com/github/codeql-action/pull/4191#start-of-content
https://github.com/
Sign inhttps://github.com/login?return_to=https%3A%2F%2Fgithub.com%2Fgithub%2Fcodeql-action%2Fpull%2F4191
GitHubRepository hosting, code review, and collaborationhttps://github.com/platform
CopilotAI coding agent for tasks, projects, and automated workhttps://github.com/features/copilot
ActionsCI/CD and automationhttps://github.com/features/actions
Code QualityQuality analysis, fixes, and enforcementhttps://github.com/features/code-quality
CodespacesCloud development environmentshttps://github.com/features/codespaces
Code SecurityVulnerability detection and remediationhttps://github.com/security/advanced-security/code-security
Secret ProtectionSecret scanning and leak preventionhttps://github.com/security/advanced-security/secret-protection
All Featureshttps://github.com/features
Documentationhttps://docs.github.com/en
Traininghttps://learn.github.com/skills
Certificationshttps://learn.github.com/credentials
Build with Copilothttps://github.com/features/ai
Customize Copilothttps://docs.github.com/en/copilot/how-tos/copilot-on-github/customize-copilot/customize-copilot-overview
Integrationshttps://github.com/marketplace
Trending reposhttps://github.com/trending
GitHub Sponsorshttps://github.com/open-source/sponsors
Developer articleshttps://github.com/resources/articles
ChangelogYour source for the latest features, improvements, and fixes across GitHub products, all in one place.https://github.blog/changelog/
Enterpriseshttps://github.com/enterprise
Teamhttps://github.com/team
Startupshttps://github.com/enterprise/startups
Nonprofitshttps://github.com/solutions/industry/nonprofits
Healthcarehttps://github.com/solutions/industry/healthcare
Financial serviceshttps://github.com/solutions/industry/financial-services
Manufacturinghttps://github.com/solutions/industry/manufacturing
Governmenthttps://github.com/solutions/industry/government
See all industrieshttps://github.com/solutions/industry
Why GitHubhttps://github.com/why-github
Customer Storieshttps://github.com/customer-stories
Business insightshttps://github.com/solutions/executive-insights
Trust Centerhttps://github.com/trust-center
GitHub Advanced SecurityEnterprise-grade code securityhttps://github.com/security/advanced-security
Copilot for businessEnterprise-grade AI featureshttps://github.com/features/copilot/copilot-business
Premium SupportEnterprise-grade 24/7 supporthttps://github.com/enterprise/premium-support
Documentationhttps://docs.github.com/en
Resource centerhttps://github.com/resources
Bloghttps://github.blog/
Events & webinarshttps://github.com/resources/events
Community Forumhttps://github.com/orgs/community/discussions
Customer Storieshttps://github.com/customer-stories
Integrationshttps://github.com/marketplace
Customer supporthttps://help.github.com/
Traininghttps://learn.github.com/skills
GitHub Statushttps://www.githubstatus.com/
Abouthttps://github.com/about
Partnershttps://github.com/partners
Changeloghttps://github.blog/changelog/
GitHub UniverseThe event for developers, by developers — talks, workshops, and what’s next for GitHub.https://githubuniverse.com/
Pricinghttps://github.com/pricing
Sign inhttps://github.com/login?return_to=https%3A%2F%2Fgithub.com%2Fgithub%2Fcodeql-action%2Fpull%2F4191
Sign uphttps://github.com/signup?ref_cta=Sign+up&ref_loc=header+logged+out&ref_page=%2F%3Cuser-name%3E%2F%3Crepo-name%3E%2Fvoltron%2Fpull_requests_fragments%2Fpull_request_layout&source=header-repo&source_repo=github%2Fcodeql-action
Reloadhttps://github.com/github/codeql-action/pull/4191
Reloadhttps://github.com/github/codeql-action/pull/4191
Reloadhttps://github.com/github/codeql-action/pull/4191
githubhttps://github.com/github
codeql-actionhttps://github.com/github/codeql-action
Codehttps://github.com/github/codeql-action
Issues164 (164)https://github.com/github/codeql-action/issues
Pull requests41 (41)https://github.com/github/codeql-action/pulls
Actionshttps://github.com/github/codeql-action/actions
Security and quality2 (2)https://github.com/github/codeql-action/security
Insightshttps://github.com/github/codeql-action/pulse
https://github.com/github/codeql-action
henrymercerhttps://github.com/henrymercer
mainhttps://github.com/github/codeql-action/tree/main
henrymercer/ci-job-failure-investigationhttps://github.com/github/codeql-action/tree/henrymercer/ci-job-failure-investigation
Conversationhttps://github.com/github/codeql-action/pull/4191
Commits2 (2)https://github.com/github/codeql-action/pull/4191/commits
Checkshttps://github.com/github/codeql-action/pull/4191/checks
Files changedhttps://github.com/github/codeql-action/pull/4191/files
Fix merge conflict handling in the rebuild workflowhttps://github.com/github/codeql-action/pull/4191#top
henrymercerhttps://github.com/henrymercer
mainhttps://github.com/github/codeql-action/tree/main
henrymercer/ci-job-failure-investigationhttps://github.com/github/codeql-action/tree/henrymercer/ci-job-failure-investigation
https://github.com/henrymercer
henrymercerhttps://github.com/henrymercer
Oct 2, 2026https://github.com/github/codeql-action/pull/4191#issue-5679842172
Please reload this pagehttps://github.com/github/codeql-action/pull/4191
#3568https://github.com/github/codeql-action/pull/3568
this runhttps://github.com/github/codeql-action/actions/runs/37023125214/job/110890948148
succeededhttps://github.com/github/codeql-action/actions/runs/37032741885
changeloghttps://github.com/github/codeql-action/blob/main/CHANGELOG.md
readmehttps://github.com/github/codeql-action/blob/main/README.md
Please reload this pagehttps://github.com/github/codeql-action/pull/4191
https://github.com/henrymercer
https://github.com/apps/github-copilot-cli
Fix detection of merge conflicts outside lib in the rebuild workflowhttps://github.com/github/codeql-action/pull/4191/commits/27c60c532d33263f9ac74c05d9e8fff183957676
27c60c5https://github.com/github/codeql-action/pull/4191/commits/27c60c532d33263f9ac74c05d9e8fff183957676
https://github.com/henrymercer
henrymercerhttps://github.com/henrymercer
Copilothttps://github.com/apps/copilot-pull-request-reviewer
October 2, 2026 15:48https://github.com/github/codeql-action/pull/4191#event-32346741067
https://github.com/apps/github-actions
github-actionshttps://github.com/apps/github-actions
size/XS https://github.com/github/codeql-action/issues?q=state%3Aopen%20label%3Asize%2FXS
Oct 2, 2026https://github.com/github/codeql-action/pull/4191#event-32346757150
started reviewinghttps://github.com/github/codeql-action/sessions/709807ff-0d4a-4f06-a755-d085eb787dd8
henrymercerhttps://github.com/henrymercer
October 2, 2026 15:49https://github.com/github/codeql-action/pull/4191#event-32346782151
View session https://github.com/github/codeql-action/sessions/709807ff-0d4a-4f06-a755-d085eb787dd8
https://github.com/apps/copilot-pull-request-reviewer
Copilothttps://github.com/apps/copilot-pull-request-reviewer
Oct 2, 2026 https://github.com/github/codeql-action/pull/4191#pullrequestreview-5393863158
View reviewed changes https://github.com/github/codeql-action/pull/4191/files
Copilothttps://github.com/apps/copilot-pull-request-reviewer
https://github.com/github/codeql-action/pull/4191#pullrequestreview-5393863158
Learn morehttps://docs.github.com/articles/managing-disruptive-comments/#hiding-a-comment
Add a code-review agent skillhttps://github.com/github/codeql-action/new/main?filename=.github/skills/code-review/SKILL.md
Learn more in the docs.https://docs.github.com/copilot/how-tos/use-copilot-agents/request-a-code-review/use-code-review?tool=webui#mcp-servers-and-agent-skills
Please reload this pagehttps://github.com/github/codeql-action/pull/4191
https://github.com/henrymercer
https://github.com/apps/github-copilot-cli
Fix the rebuild workflow failing when merging the base branch conflictshttps://github.com/github/codeql-action/pull/4191/commits/56b0d5f02c15aec22d79bfd6e21d4f7829742b54
56b0d5fhttps://github.com/github/codeql-action/pull/4191/commits/56b0d5f02c15aec22d79bfd6e21d4f7829742b54
https://github.com/henrymercer
henrymercerhttps://github.com/henrymercer
force-pushedhttps://github.com/github/codeql-action/compare/500a66b2428d2ba8edb34bcbda48021501d53959..56b0d5f02c15aec22d79bfd6e21d4f7829742b54
500a66bhttps://github.com/github/codeql-action/commit/500a66b2428d2ba8edb34bcbda48021501d53959
56b0d5fhttps://github.com/github/codeql-action/commit/56b0d5f02c15aec22d79bfd6e21d4f7829742b54
Compare https://github.com/github/codeql-action/compare/500a66b2428d2ba8edb34bcbda48021501d53959..56b0d5f02c15aec22d79bfd6e21d4f7829742b54
October 2, 2026 16:12https://github.com/github/codeql-action/pull/4191#event-32348251307
https://github.com/apps/github-actions
github-actionshttps://github.com/apps/github-actions
size/S https://github.com/github/codeql-action/issues?q=state%3Aopen%20label%3Asize%2FS
size/XS https://github.com/github/codeql-action/issues?q=state%3Aopen%20label%3Asize%2FXS
Oct 2, 2026https://github.com/github/codeql-action/pull/4191#event-32348290319
https://github.com/henrymercer
henrymercerhttps://github.com/henrymercer
Copilothttps://github.com/apps/copilot-pull-request-reviewer
October 2, 2026 16:18https://github.com/github/codeql-action/pull/4191#event-32348667343
started reviewinghttps://github.com/github/codeql-action/sessions/3cbf139f-f210-4e9b-8689-b31743a1bd87
henrymercerhttps://github.com/henrymercer
October 2, 2026 16:19https://github.com/github/codeql-action/pull/4191#event-32348714716
View session https://github.com/github/codeql-action/sessions/3cbf139f-f210-4e9b-8689-b31743a1bd87
https://github.com/apps/copilot-pull-request-reviewer
Copilothttps://github.com/apps/copilot-pull-request-reviewer
Oct 2, 2026 https://github.com/github/codeql-action/pull/4191#pullrequestreview-5394154346
View reviewed changes https://github.com/github/codeql-action/pull/4191/files/56b0d5f02c15aec22d79bfd6e21d4f7829742b54
Copilothttps://github.com/apps/copilot-pull-request-reviewer
https://github.com/github/codeql-action/pull/4191#pullrequestreview-5394154346
Learn morehttps://docs.github.com/articles/managing-disruptive-comments/#hiding-a-comment
Please reload this pagehttps://github.com/github/codeql-action/pull/4191
https://github.com/henrymercer
henrymercerhttps://github.com/henrymercer
October 2, 2026 16:22https://github.com/github/codeql-action/pull/4191#event-32348860398
https://github.com/henrymercer
henrymercerhttps://github.com/henrymercer
code ownerhttps://github.com/github/codeql-action/blob/c5351685443cb2f04754e848d1b26ca745b5e7ed/CODEOWNERS#L1
October 2, 2026 16:22https://github.com/github/codeql-action/pull/4191#event-32348861708
https://github.com/mbg
mbghttps://github.com/mbg
Oct 2, 2026 https://github.com/github/codeql-action/pull/4191#pullrequestreview-5395061352
View reviewed changes https://github.com/github/codeql-action/pull/4191/files/56b0d5f02c15aec22d79bfd6e21d4f7829742b54
mbghttps://github.com/mbg
https://github.com/github/codeql-action/pull/4191#pullrequestreview-5395061352
Learn morehttps://docs.github.com/articles/managing-disruptive-comments/#hiding-a-comment
Please reload this pagehttps://github.com/github/codeql-action/pull/4191
.github/workflows/rebuild.ymlhttps://github.com/github/codeql-action/pull/4191/files/56b0d5f02c15aec22d79bfd6e21d4f7829742b54#diff-0c7eab12920506f26fabb59326dd3db29190c63c1ad8135d61e7e6cdcaec2fc8
Please reload this pagehttps://github.com/github/codeql-action/pull/4191
https://github.com/henrymercer
henrymercerhttps://github.com/henrymercer
merge queuehttps://github.com/github/codeql-action/queue/main
Oct 5, 2026https://github.com/github/codeql-action/pull/4191#event-32495695799
d8251b8https://github.com/github/codeql-action/commit/d8251b8572db9671915a70de606ed39bc2259c91
Oct 5, 2026https://github.com/github/codeql-action/pull/4191#event-32496691182
Please reload this pagehttps://github.com/github/codeql-action/pull/4191
https://github.com/henrymercer
henrymercerhttps://github.com/henrymercer
October 5, 2026 09:58https://github.com/github/codeql-action/pull/4191#event-32496693865
Merge main into releases/v4 #4214 https://github.com/github/codeql-action/pull/4214
Merge releases/v4 into releases/v3 #4216 https://github.com/github/codeql-action/pull/4216
https://github.co/hiddenchars
https://github.com/github/codeql-action/pull/{{ revealButtonHref }}
Sign up for freehttps://github.com/join?source=comment-repo
Sign in to commenthttps://github.com/login?return_to=https%3A%2F%2Fgithub.com%2Fgithub%2Fcodeql-action%2Fpull%2F4191
https://github.com/mbg
mbg https://github.com/mbg
https://github.com/github/codeql-action/pull/4191/files/56b0d5f02c15aec22d79bfd6e21d4f7829742b54
Copilot code review https://github.com/apps/copilot-pull-request-reviewer
Copilot https://github.com/apps/copilot-pull-request-reviewer
Learn more about Copilot code review.https://gh.io/copilot-code-review-docs
https://github.com/github/codeql-action/pull/4191/files/56b0d5f02c15aec22d79bfd6e21d4f7829742b54
Please reload this pagehttps://github.com/github/codeql-action/pull/4191
size/S https://github.com/github/codeql-action/issues?q=state%3Aopen%20label%3Asize%2FS
Please reload this pagehttps://github.com/github/codeql-action/pull/4191
https://github.com/henrymercer
https://github.com/mbg
https://github.com/apps/copilot-pull-request-reviewer
https://github.com
Termshttps://docs.github.com/site-policy/github-terms/github-terms-of-service
Privacyhttps://docs.github.com/site-policy/privacy-policies/github-privacy-statement
Securityhttps://github.com/security
Statushttps://www.githubstatus.com/
Communityhttps://github.community/
Docshttps://docs.github.com/
Contacthttps://support.github.com?tags=dotcom-footer

Viewport: width=device-width

URLs of crawlers that visited me.