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
Domain: github.com
{"@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-profiling | 0 |
| react-import-map | react,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-controller | voltron_issues_fragments |
| route-action | issue_layout |
| fetch-nonce | v2:184e87ba-1048-2548-072c-92deb4ce6f4e |
| current-catalog-service-hash | 81bb79d38c15960b92d99bca9288a9108c7a47b18f2423d0f6438c5b7bcd2114 |
| request-id | EAF6:8AE25:1A5038E:22D1DC5:6B021C2F |
| html-safe-nonce | 3167b9d65b93ac7c26e6cc48b439f0be5f33989281f604b2ba7e234349ce7d27 |
| visitor-payload | eyJyZWZlcnJlciI6IiIsInJlcXVlc3RfaWQiOiJFQUY2OjhBRTI1OjFBNTAzOEU6MjJEMURDNTo2QjAyMUMyRiIsInZpc2l0b3JfaWQiOiIxMTI1MjUzNjU3NzkzNzk3MTY3IiwicmVnaW9uX2VkZ2UiOiJpYWQiLCJyZWdpb25fcmVuZGVyIjoiaWFkIn0= |
| visitor-hmac | d5e0c9c0d5badce25f10a27e2b8b28fe694cef8941097c7f92f31905d2b323f7 |
| hovercard-subject-tag | issue:2756506435 |
| github-keyboard-shortcuts | repository,issues,copilot |
| google-site-verification | Apib7-x98H0j5cPqHWwSMm6dNU4GmODRoqxLiDzdx9I |
| octolytics-url | https://collector.github.com/github/collect |
| analytics-location | / |
| fb:app_id | 1401488693436528 |
| apple-itunes-app | app-id=1477376905, app-argument=https://github.com/_view_fragments/issues/show/python/bench_runner/323/issue_layout |
| twitter:image | https://opengraph.githubassets.com/e54e191945e56c9156fbcec9a70dc95b90518f42dec9a52608a6ee4ca5804a87/python/bench_runner/issues/323 |
| twitter:card | summary_large_image |
| og:image | https://opengraph.githubassets.com/e54e191945e56c9156fbcec9a70dc95b90518f42dec9a52608a6ee4ca5804a87/python/bench_runner/issues/323 |
| og:image:alt | 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... |
| og:image:width | 1200 |
| og:image:height | 600 |
| og:site_name | GitHub |
| og:type | object |
| og:author:username | mpage |
| hostname | github.com |
| expected-hostname | github.com |
| None | 87e774ee7c6b3bee0490394e4d3e57ec9dbc956f74b87ea685dc8996c1676456 |
| turbo-cache-control | no-preview |
| go-import | github.com/python/bench_runner git https://github.com/python/bench_runner.git |
| octolytics-dimension-user_id | 1525981 |
| octolytics-dimension-user_login | python |
| octolytics-dimension-repository_id | 656847333 |
| octolytics-dimension-repository_nwo | python/bench_runner |
| octolytics-dimension-repository_public | true |
| octolytics-dimension-repository_is_fork | false |
| octolytics-dimension-repository_network_root_id | 656847333 |
| octolytics-dimension-repository_network_root_nwo | python/bench_runner |
| 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 | 423dbb54c5e7bfecc838eb387c1435eb3d0e760d |
| ui-target | full |
| theme-color | #1e2327 |
| color-scheme | light dark |
| react-app-name | issues |
Links:
Viewport: width=device-width