| react-profiling | 0 |
| react-import-map | react,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-controller | voltron_pull_requests_fragments |
| route-action | pull_request_layout |
| fetch-nonce | v2:3582d58d-8df3-d623-aa25-6f8f16d54d16 |
| current-catalog-service-hash | ae870bc5e265a340912cde392f23dad3671a0a881730ffdadd82f2f57d81641b |
| request-id | B0AA:2E6564:13BDFF5:1A352BA:6AF891C7 |
| html-safe-nonce | 8fa2bc8e4e054c54e2a9fea61309ab0762004aad83134053b0cef9d7c49a9b1b |
| visitor-payload | eyJyZWZlcnJlciI6IiIsInJlcXVlc3RfaWQiOiJCMEFBOjJFNjU2NDoxM0JERkY1OjFBMzUyQkE6NkFGODkxQzciLCJ2aXNpdG9yX2lkIjoiMjM4MTM1NDc4OTU0NDQzMjA3MSIsInJlZ2lvbl9lZGdlIjoiaWFkIiwicmVnaW9uX3JlbmRlciI6ImlhZCJ9 |
| visitor-hmac | 5e07e0ff6716424c4d2e3e537baef1f893c87b596eb7483283645894259bb965 |
| hovercard-subject-tag | pull_request:3113523255 |
| github-keyboard-shortcuts | repository,pull-request-list,pull-request-conversation,pull-request-files-changed,copilot |
| google-site-verification | Apib7-x98H0j5cPqHWwSMm6dNU4GmODRoqxLiDzdx9I |
| octolytics-url | https://collector.github.com/github/collect |
| analytics-location | ///voltron/pull_requests_fragments/pull_request_layout |
| fb:app_id | 1401488693436528 |
| apple-itunes-app | app-id=1477376905, app-argument=https://github.com/_view_fragments/voltron/pull_requests/show/microsoft/codeql/312/pull_request_layout |
| twitter:image | https://opengraph.githubassets.com/b8ca1c5c4f3d6aad827f9570337a5d5497588a0a37d9a91db87a973113b11237/microsoft/codeql/pull/312 |
| twitter:card | summary_large_image |
| og:image | https://opengraph.githubassets.com/b8ca1c5c4f3d6aad827f9570337a5d5497588a0a37d9a91db87a973113b11237/microsoft/codeql/pull/312 |
| og:image:alt | The TaintedPathQuery.qll has a history of incorrect merge conflict resolution, and yesterday I contributed to that history when trying to resolve conflicts for our 2.23.8 upgrade 😂 Here's a bri... |
| og:image:width | 1200 |
| og:image:height | 600 |
| og:site_name | GitHub |
| og:type | object |
| og:author:username | MathiasVP |
| hostname | github.com |
| expected-hostname | github.com |
| None | 612d3e6ffd693e7ea8d9fcf452370995872baef31d825b1fedef704cd3d24ac7 |
| turbo-cache-control | no-cache |
| go-import | github.com/microsoft/codeql git https://github.com/microsoft/codeql.git |
| octolytics-dimension-user_id | 6154722 |
| octolytics-dimension-user_login | microsoft |
| octolytics-dimension-repository_id | 566523451 |
| octolytics-dimension-repository_nwo | microsoft/codeql |
| octolytics-dimension-repository_public | true |
| octolytics-dimension-repository_is_fork | true |
| octolytics-dimension-repository_parent_id | 143040428 |
| octolytics-dimension-repository_parent_nwo | github/codeql |
| octolytics-dimension-repository_network_root_id | 143040428 |
| octolytics-dimension-repository_network_root_nwo | github/codeql |
| turbo-body-classes | logged-out env-production page-responsive |
| disable-turbo | false |
| browser-stats-url | https://api.github.com/_private/browser/stats |
| browser-errors-url | https://api.github.com/_private/browser/errors |
| release | 072e34035c13c31543fba9f025cbbbda4210dae4 |
| ui-target | full |
| theme-color | #1e2327 |
| color-scheme | light dark |
| react-app-name | pull-requests |
| Skip to content | https://github.com/microsoft/codeql/pull/312#start-of-content |
| https://github.com/ |
| Sign in | https://github.com/login?return_to=https%3A%2F%2Fgithub.com%2Fmicrosoft%2Fcodeql%2Fpull%2F312 |
| GitHubRepository hosting, code review, and collaboration | https://github.com/platform |
| CopilotAI coding agent for tasks, projects, and automated work | https://github.com/features/copilot |
| ActionsCI/CD and automation | https://github.com/features/actions |
| Code QualityQuality analysis, fixes, and enforcement | https://github.com/features/code-quality |
| CodespacesCloud development environments | https://github.com/features/codespaces |
| Code SecurityVulnerability detection and remediation | https://github.com/security/advanced-security/code-security |
| Secret ProtectionSecret scanning and leak prevention | https://github.com/security/advanced-security/secret-protection |
| All Features | https://github.com/features |
| Documentation | https://docs.github.com/en |
| Training | https://learn.github.com/skills |
| Certifications | https://learn.github.com/credentials |
| Build with Copilot | https://github.com/features/ai |
| Customize Copilot | https://docs.github.com/en/copilot/how-tos/copilot-on-github/customize-copilot/customize-copilot-overview |
| Integrations | https://github.com/marketplace |
| Trending repos | https://github.com/trending |
| GitHub Sponsors | https://github.com/open-source/sponsors |
| Developer articles | https://github.com/resources/articles |
| ChangelogYour source for the latest features, improvements, and fixes across GitHub products, all in one place. | https://github.blog/changelog/ |
| Enterprises | https://github.com/enterprise |
| Team | https://github.com/team |
| Startups | https://github.com/enterprise/startups |
| Nonprofits | https://github.com/solutions/industry/nonprofits |
| Healthcare | https://github.com/solutions/industry/healthcare |
| Financial services | https://github.com/solutions/industry/financial-services |
| Manufacturing | https://github.com/solutions/industry/manufacturing |
| Government | https://github.com/solutions/industry/government |
| See all industries | https://github.com/solutions/industry |
| Why GitHub | https://github.com/why-github |
| Customer Stories | https://github.com/customer-stories |
| Business insights | https://github.com/solutions/executive-insights |
| Trust Center | https://github.com/trust-center |
| GitHub Advanced SecurityEnterprise-grade code security | https://github.com/security/advanced-security |
| Copilot for businessEnterprise-grade AI features | https://github.com/features/copilot/copilot-business |
| Premium SupportEnterprise-grade 24/7 support | https://github.com/enterprise/premium-support |
| Documentation | https://docs.github.com/en |
| Resource center | https://github.com/resources |
| Blog | https://github.blog/ |
| Events & webinars | https://github.com/resources/events |
| Community Forum | https://github.com/orgs/community/discussions |
| Customer Stories | https://github.com/customer-stories |
| Integrations | https://github.com/marketplace |
| Customer support | https://help.github.com/ |
| Training | https://learn.github.com/skills |
| GitHub Status | https://www.githubstatus.com/ |
| About | https://github.com/about |
| Partners | https://github.com/partners |
| Changelog | https://github.blog/changelog/ |
| GitHub UniverseThe event for developers, by developers — talks, workshops, and what’s next for GitHub. | https://githubuniverse.com/ |
| Pricing | https://github.com/pricing |
| Sign in | https://github.com/login?return_to=https%3A%2F%2Fgithub.com%2Fmicrosoft%2Fcodeql%2Fpull%2F312 |
| Sign up | https://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=microsoft%2Fcodeql |
| Reload | https://github.com/microsoft/codeql/pull/312 |
| Reload | https://github.com/microsoft/codeql/pull/312 |
| Reload | https://github.com/microsoft/codeql/pull/312 |
| microsoft | https://github.com/microsoft |
| codeql | https://github.com/microsoft/codeql |
| Code | https://github.com/microsoft/codeql |
| Issues15 (15) | https://github.com/microsoft/codeql/issues |
| Pull requests28 (28) | https://github.com/microsoft/codeql/pulls |
| Actions | https://github.com/microsoft/codeql/actions |
| Projects | https://github.com/microsoft/codeql/projects |
| Security and quality | https://github.com/microsoft/codeql/security |
| Insights | https://github.com/microsoft/codeql/pulse |
| https://github.com/microsoft/codeql |
| dilanbhalla | https://github.com/dilanbhalla |
| main | https://github.com/microsoft/codeql/tree/main |
| fix-merge-conflict-inTaintedPathQuery-2 | https://github.com/microsoft/codeql/tree/fix-merge-conflict-inTaintedPathQuery-2 |
| Conversation | https://github.com/microsoft/codeql/pull/312 |
| Commits3 (3) | https://github.com/microsoft/codeql/pull/312/commits |
| Checks | https://github.com/microsoft/codeql/pull/312/checks |
| Files changed | https://github.com/microsoft/codeql/pull/312/files |
| C#: Fix an incorrect merge conflict resolution. | https://github.com/microsoft/codeql/pull/312#top |
| dilanbhalla | https://github.com/dilanbhalla |
| main | https://github.com/microsoft/codeql/tree/main |
| fix-merge-conflict-inTaintedPathQuery-2 | https://github.com/microsoft/codeql/tree/fix-merge-conflict-inTaintedPathQuery-2 |
|
| https://github.com/MathiasVP |
| Mathias Vorreiter Pedersen (MathiasVP) | https://github.com/MathiasVP |
| Dec 18, 2025 | https://github.com/microsoft/codeql/pull/312#issue-3742881680 |
| Please reload this page | https://github.com/microsoft/codeql/pull/312 |
| C#: Fix FPs (and a small FN) in cs/path-injection #237 | https://github.com/microsoft/codeql/pull/237 |
| 4c5945f#diff-3866121201b771f0b15e26381ce986bcd0cee96ce38230fdb5be9819db579528 | https://github.com/microsoft/codeql/commit/4c5945f4aa741cb9ef44b82ce211e14b366352dc#diff-3866121201b771f0b15e26381ce986bcd0cee96ce38230fdb5be9819db579528 |
| https://private-user-images.githubusercontent.com/4527323/528078157-05139ffe-610f-4642-9755-9cf3784afb9e.png?jwt=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3OTQ2NzU0NDMsIm5iZiI6MTc5NDY3NTE0MywicGF0aCI6Ii80NTI3MzIzLzUyODA3ODE1Ny0wNTEzOWZmZS02MTBmLTQ2NDItOTc1NS05Y2YzNzg0YWZiOWUucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI2MTExNCUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNjExMTRUMTY1MjIzWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9ZTZlY2JiNWI0ZDhiMmY1NzA3MGMwYTcyY2RlN2FmZGM3ZTA5NjUyMDI5ZTY4YmMwMzRjZTljODdhOWQxNDE0NSZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QmcmVzcG9uc2UtY29udGVudC10eXBlPWltYWdlJTJGcG5nIn0.H4Ia5f82yNJTzEtCi2KOwNHBp3GfrGSaJCJNVT6e42k |
| a26da74#diff-3866121201b771f0b15e26381ce986bcd0cee96ce38230fdb5be9819db579528 | https://github.com/microsoft/codeql/commit/a26da74baf3ed21f1c034310547030717ef03eb2#diff-3866121201b771f0b15e26381ce986bcd0cee96ce38230fdb5be9819db579528 |
| https://private-user-images.githubusercontent.com/4527323/528078761-7fb0428e-e9ad-4f40-bbc5-a8139315be05.png?jwt=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3OTQ2NzU0NDMsIm5iZiI6MTc5NDY3NTE0MywicGF0aCI6Ii80NTI3MzIzLzUyODA3ODc2MS03ZmIwNDI4ZS1lOWFkLTRmNDAtYmJjNS1hODEzOTMxNWJlMDUucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI2MTExNCUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNjExMTRUMTY1MjIzWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9NWY3MjFiYTY0NDRiYWE5ZDM3YjVjOGY5MmY2M2YwZTBkOWEyYjY0MWE5NjIzNTNhOTQyNzU0NTU3MzUyY2JkMCZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QmcmVzcG9uc2UtY29udGVudC10eXBlPWltYWdlJTJGcG5nIn0.uTTqhJEldvEgX4ucXqsNGTFL0rZygu474u297S1NvwY |
| 6a1f66b | https://github.com/microsoft/codeql/commit/6a1f66b1375dc1bbc18f26dbacd9497eca3d928e |
| https://private-user-images.githubusercontent.com/4527323/528078910-cfe33ab1-0483-43bd-a9a4-63336389e502.png?jwt=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3OTQ2NzU0NDMsIm5iZiI6MTc5NDY3NTE0MywicGF0aCI6Ii80NTI3MzIzLzUyODA3ODkxMC1jZmUzM2FiMS0wNDgzLTQzYmQtYTlhNC02MzMzNjM4OWU1MDIucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI2MTExNCUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNjExMTRUMTY1MjIzWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9NzMxYzI1YmU2M2RhZThmMzA2ZDAwZWQ1M2YxZDJlMjM0MjcyZGY1MmIwOGU2Y2FjNzAwMDk4NDNiYTNlNjU0MyZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QmcmVzcG9uc2UtY29udGVudC10eXBlPWltYWdlJTJGcG5nIn0._naoX0jlR7WaInTvXu7etqaAbR8VswF_thq_DXk5T1g |
| #237 | https://github.com/microsoft/codeql/pull/237 |
| 4dfa886 | https://github.com/microsoft/codeql/commit/4dfa88626ab3a75d2f4216020809f3ad44c6b4d9 |
| fa9f02a | https://github.com/microsoft/codeql/commit/fa9f02a6f3e7ca3572c0de750015be1d7bb91003 |
| Please reload this page | https://github.com/microsoft/codeql/pull/312 |
| Mathias Vorreiter Pedersen (MathiasVP) | https://github.com/MathiasVP |
| December 18, 2025 11:53 | https://github.com/microsoft/codeql/pull/312#commits-pushed-9d04abb |
|
| https://github.com/MathiasVP |
| C#: Fix an incorrect merge conflict resolution. | https://github.com/microsoft/codeql/pull/312/commits/9d04abbce37a9312ed6df2fa9079fcbf88f27141 |
| 9d04abb | https://github.com/microsoft/codeql/pull/312/commits/9d04abbce37a9312ed6df2fa9079fcbf88f27141 |
|
| https://github.com/MathiasVP |
| C#: Drive-by fix. The 'GOOD' test was not actually | https://github.com/microsoft/codeql/pull/312/commits/fa9f02a6f3e7ca3572c0de750015be1d7bb91003 |
| fa9f02a | https://github.com/microsoft/codeql/pull/312/commits/fa9f02a6f3e7ca3572c0de750015be1d7bb91003 |
| 4dfa886 | https://github.com/microsoft/codeql/commit/4dfa88626ab3a75d2f4216020809f3ad44c6b4d9 |
|
| https://github.com/MathiasVP |
| Merge branch 'main' into fix-merge-conflict-inTaintedPathQuery-2 | https://github.com/microsoft/codeql/pull/312/commits/f9e116583137398275235502d5e0848a00ece359 |
| f9e1165 | https://github.com/microsoft/codeql/pull/312/commits/f9e116583137398275235502d5e0848a00ece359 |
| https://github.com/dilanbhalla |
| dilanbhalla | https://github.com/dilanbhalla |
|
Dec 18, 2025
| https://github.com/microsoft/codeql/pull/312#pullrequestreview-3594723568 |
|
View reviewed changes
| https://github.com/microsoft/codeql/pull/312/files/f9e116583137398275235502d5e0848a00ece359 |
| https://github.com/dilanbhalla |
| dilanbhalla | https://github.com/dilanbhalla |
| 626127b | https://github.com/microsoft/codeql/commit/626127b9c5cff353f26db805bfae41796ece92d4 |
| Dec 18, 2025 | https://github.com/microsoft/codeql/pull/312#event-21652515211 |
| Please reload this page | https://github.com/microsoft/codeql/pull/312 |
| https://github.co/hiddenchars |
| https://github.com/microsoft/codeql/pull/{{ revealButtonHref }} |
| Sign up for free | https://github.com/join?source=comment-repo |
| Sign in to comment | https://github.com/login?return_to=https%3A%2F%2Fgithub.com%2Fmicrosoft%2Fcodeql%2Fpull%2F312 |
|
| https://github.com/dilanbhalla |
|
dilanbhalla
| https://github.com/dilanbhalla |
|
| https://github.com/microsoft/codeql/pull/312/files/f9e116583137398275235502d5e0848a00ece359 |
| Please reload this page | https://github.com/microsoft/codeql/pull/312 |
| Please reload this page | https://github.com/microsoft/codeql/pull/312 |
|
| https://github.com/MathiasVP |
|
| https://github.com/dilanbhalla |
|
| https://github.com |
| Terms | https://docs.github.com/site-policy/github-terms/github-terms-of-service |
| Privacy | https://docs.github.com/site-policy/privacy-policies/github-privacy-statement |
| Security | https://github.com/security |
| Status | https://www.githubstatus.com/ |
| Community | https://github.community/ |
| Docs | https://docs.github.com/ |
| Contact | https://support.github.com?tags=dotcom-footer |