René's URL Explorer Experiment


Title: Benchmark runners may commit results that contain merge conflicts · Issue #323 · python/bench_runner · GitHub

Open Graph Title: Benchmark runners may commit results that contain merge conflicts · Issue #323 · python/bench_runner

X Title: Benchmark runners may commit results that contain merge conflicts · Issue #323 · python/bench_runner

Description: Benchmark runners may commit results that contain merge conflicts. We ran into this recently: One of our weekly runs committed benchmarking results for commit 2a66dd3. Afterwards, another benchmark run ran for the same commit, and commit...

Open Graph Description: Benchmark runners may commit results that contain merge conflicts. We ran into this recently: One of our weekly runs committed benchmarking results for commit 2a66dd3. Afterwards, another benchmark...

X Description: Benchmark runners may commit results that contain merge conflicts. We ran into this recently: One of our weekly runs committed benchmarking results for commit 2a66dd3. Afterwards, another benchmark...

Opengraph URL: https://github.com/python/bench_runner/issues/323

X: @github

direct link

Domain: github.com


Hey, it has json ld scripts:
{"@context":"https://schema.org","@type":"DiscussionForumPosting","headline":"Benchmark runners may commit results that contain merge conflicts","articleBody":"Benchmark runners may commit results that contain merge conflicts. We ran into this recently:\r\n\r\n*  [One of our weekly runs](https://github.com/facebookexperimental/free-threading-benchmarking/actions/runs/12449538059/job/34755295505) committed benchmarking results for commit `2a66dd3`. \r\n* Afterwards, [another benchmark run](https://github.com/facebookexperimental/free-threading-benchmarking/actions/runs/12449641901/job/34755539745) ran for the same commit, and committed [results](https://github.com/facebookexperimental/free-threading-benchmarking/commit/05044a4cbfb1e31fa2d341410f59b20404ab982c) that contain merge conflicts.\r\n\r\nIt looks like we try to handle this situation:\r\n\r\nhttps://github.com/faster-cpython/bench_runner/blob/d0569e73e0f993f3da17d561fcdf4ada1e78a076/bench_runner/templates/_benchmark.src.yml#L131-L135\r\n\r\nHowever, the approach that we're using doesn't work. It looks like `-X ours` doesn't apply to resolving merge conflicts that result from applying stashed changes. I verified this locally by:\r\n\r\n1. Creating a new repo containing a single markdown file.\r\n2. Cloning the repo into a new directory.\r\n3. Editing the markdown file in a way that would generate a merge conflict.\r\n4. Ran `git pull -s recursive -X ours --autostash --rebase`. The merge conflicts are left for resolution.\r\n\r\nI'm not sure if this is a behavior that changed in git recently. I've tested this using git versions `2.39.5` and `2.47.1`.","author":{"url":"https://github.com/mpage","@type":"Person","name":"mpage"},"datePublished":"2024-12-23T18:00:55Z","url":"https://github.com/python/bench_runner/issues/323"}

react-profiling0
react-import-mapreact,react-dom,react-dom/client,react-dom/profiling,react-is,react/compiler-runtime,react/jsx-dev-runtime,react/jsx-runtime,scheduler@b8488ee2c322
route-pattern/_view_fragments/issues/show/:user_id/:repository/:id/issue_layout(.:format)
route-controllervoltron_issues_fragments
route-actionissue_layout
fetch-noncev2:184e87ba-1048-2548-072c-92deb4ce6f4e
current-catalog-service-hash81bb79d38c15960b92d99bca9288a9108c7a47b18f2423d0f6438c5b7bcd2114
request-idEAF6:8AE25:1A5038E:22D1DC5:6B021C2F
html-safe-nonce3167b9d65b93ac7c26e6cc48b439f0be5f33989281f604b2ba7e234349ce7d27
visitor-payloadeyJyZWZlcnJlciI6IiIsInJlcXVlc3RfaWQiOiJFQUY2OjhBRTI1OjFBNTAzOEU6MjJEMURDNTo2QjAyMUMyRiIsInZpc2l0b3JfaWQiOiIxMTI1MjUzNjU3NzkzNzk3MTY3IiwicmVnaW9uX2VkZ2UiOiJpYWQiLCJyZWdpb25fcmVuZGVyIjoiaWFkIn0=
visitor-hmacd5e0c9c0d5badce25f10a27e2b8b28fe694cef8941097c7f92f31905d2b323f7
hovercard-subject-tagissue:2756506435
github-keyboard-shortcutsrepository,issues,copilot
google-site-verificationApib7-x98H0j5cPqHWwSMm6dNU4GmODRoqxLiDzdx9I
octolytics-urlhttps://collector.github.com/github/collect
analytics-location///voltron/issues_fragments/issue_layout
fb:app_id1401488693436528
apple-itunes-appapp-id=1477376905, app-argument=https://github.com/_view_fragments/issues/show/python/bench_runner/323/issue_layout
twitter:imagehttps://opengraph.githubassets.com/e54e191945e56c9156fbcec9a70dc95b90518f42dec9a52608a6ee4ca5804a87/python/bench_runner/issues/323
twitter:cardsummary_large_image
og:imagehttps://opengraph.githubassets.com/e54e191945e56c9156fbcec9a70dc95b90518f42dec9a52608a6ee4ca5804a87/python/bench_runner/issues/323
og:image:altBenchmark runners may commit results that contain merge conflicts. We ran into this recently: One of our weekly runs committed benchmarking results for commit 2a66dd3. Afterwards, another benchmark...
og:image:width1200
og:image:height600
og:site_nameGitHub
og:typeobject
og:author:usernamempage
hostnamegithub.com
expected-hostnamegithub.com
None87e774ee7c6b3bee0490394e4d3e57ec9dbc956f74b87ea685dc8996c1676456
turbo-cache-controlno-preview
go-importgithub.com/python/bench_runner git https://github.com/python/bench_runner.git
octolytics-dimension-user_id1525981
octolytics-dimension-user_loginpython
octolytics-dimension-repository_id656847333
octolytics-dimension-repository_nwopython/bench_runner
octolytics-dimension-repository_publictrue
octolytics-dimension-repository_is_forkfalse
octolytics-dimension-repository_network_root_id656847333
octolytics-dimension-repository_network_root_nwopython/bench_runner
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
release423dbb54c5e7bfecc838eb387c1435eb3d0e760d
ui-targetfull
theme-color#1e2327
color-schemelight dark
react-app-nameissues

Links:

Skip to contenthttps://github.com/python/bench_runner/issues/323#start-of-content
https://github.com/
Sign inhttps://github.com/login?return_to=https%3A%2F%2Fgithub.com%2Fpython%2Fbench_runner%2Fissues%2F323
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%2Fpython%2Fbench_runner%2Fissues%2F323
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%2Fissues_fragments%2Fissue_layout&source=header-repo&source_repo=python%2Fbench_runner
Reloadhttps://github.com/python/bench_runner/issues/323
Reloadhttps://github.com/python/bench_runner/issues/323
Reloadhttps://github.com/python/bench_runner/issues/323
pythonhttps://github.com/python
bench_runnerhttps://github.com/python/bench_runner
Codehttps://github.com/python/bench_runner
Issues16 (16)https://github.com/python/bench_runner/issues
Pull requests2 (2)https://github.com/python/bench_runner/pulls
Actionshttps://github.com/python/bench_runner/actions
Projectshttps://github.com/python/bench_runner/projects
Security and qualityhttps://github.com/python/bench_runner/security
Insightshttps://github.com/python/bench_runner/insights
https://github.com/python/bench_runner
New issuehttps://github.com/login?return_to=https://github.com/python/bench_runner/issues/323
New issuehttps://github.com/login?return_to=https://github.com/python/bench_runner/issues/323
Benchmark runners may commit results that contain merge conflictshttps://github.com/python/bench_runner/issues/323#top
https://github.com/mpage
mpagehttps://github.com/mpage
on Dec 23, 2024https://github.com/python/bench_runner/issues/323#issue-2756506435
One of our weekly runshttps://github.com/facebookexperimental/free-threading-benchmarking/actions/runs/12449538059/job/34755295505
another benchmark runhttps://github.com/facebookexperimental/free-threading-benchmarking/actions/runs/12449641901/job/34755539745
resultshttps://github.com/facebookexperimental/free-threading-benchmarking/commit/05044a4cbfb1e31fa2d341410f59b20404ab982c
https://github.com/faster-cpython/bench_runner/blob/d0569e73e0f993f3da17d561fcdf4ada1e78a076/bench_runner/templates/_benchmark.src.yml#L131-L135https://github.com/faster-cpython/bench_runner/blob/d0569e73e0f993f3da17d561fcdf4ada1e78a076/bench_runner/templates/_benchmark.src.yml#L131-L135
https://github.com/mpage
mpagehttps://github.com/mpage
on Dec 23, 2024https://github.com/python/bench_runner/issues/323#issuecomment-2560156369
@mdboomhttps://github.com/mdboom
https://github.com/mdboom
mdboomhttps://github.com/mdboom
on Jan 3, 2025https://github.com/python/bench_runner/issues/323#issuecomment-2569836087
mdboomhttps://github.com/mdboom
on Jan 7, 2025https://github.com/python/bench_runner/issues/323#event-15843973906
Fix #323: Always accept local changes to resolve merge conflictshttps://github.com/python/bench_runner/commit/ce657e4fa68069875801d7d1347cd43604eb574f
#323https://github.com/python/bench_runner/issues/323
https://docs.github.com/articles/closing-issues-via-commit-messages
ce657e4https://github.com/python/bench_runner/commit/ce657e4fa68069875801d7d1347cd43604eb574f
mdboomhttps://github.com/mdboom
completedhttps://github.com/python/bench_runner/issues?q=is%3Aissue%20state%3Aclosed%20archived%3Afalse%20reason%3Acompleted
ce657e4https://github.com/python/bench_runner/commit/ce657e4fa68069875801d7d1347cd43604eb574f
on Jan 9, 2025https://github.com/python/bench_runner/issues/323#event-15868613904
mdboomhttps://github.com/mdboom
on Jan 9, 2025https://github.com/python/bench_runner/issues/323#event-15868613955
Merge pull request #325 from faster-cpython/handle-merge-conflictshttps://github.com/python/bench_runner/commit/21d36264ca032906b53fb95b862c7860d0b9f8e3
#325https://github.com/python/bench_runner/pull/325
https://docs.github.com/articles/closing-issues-via-commit-messages
21d3626https://github.com/python/bench_runner/commit/21d36264ca032906b53fb95b862c7860d0b9f8e3
Revert "Fix #323: Always accept local changes to resolve merge confli…https://github.com/python/bench_runner/commit/b269de4aa6d2d392df6dd5c36058ebd269524011
#323https://github.com/python/bench_runner/issues/323
https://docs.github.com/articles/closing-issues-via-commit-messages
b269de4https://github.com/python/bench_runner/commit/b269de4aa6d2d392df6dd5c36058ebd269524011
Merge pull request #328 from faster-cpython/revert-325-handle-merge-c…https://github.com/python/bench_runner/commit/8009f4408f849c4874ce884af482472478e7e387
#328https://github.com/python/bench_runner/pull/328
https://docs.github.com/articles/closing-issues-via-commit-messages
8009f44https://github.com/python/bench_runner/commit/8009f4408f849c4874ce884af482472478e7e387
mdboomhttps://github.com/mdboom
on Jan 9, 2025https://github.com/python/bench_runner/issues/323#event-15871951529
https://github.com/mdboom
mdboomhttps://github.com/mdboom
on Jan 9, 2025https://github.com/python/bench_runner/issues/323#issuecomment-2580992657
Sign up for freehttps://github.com/signup?return_to=https://github.com/python/bench_runner/issues/323
Sign in to commenthttps://github.com/login?return_to=https://github.com/python/bench_runner/issues/323
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.