Repository navigation
用真实 merge 接回上游 git 历史（squash #2 之后） - #3
Merged
Merged
Conversation
refactor holiday function
add join example to dataframe tutorial
…proof (dask#250) * Synchronize readme and env spec and put pins in env to mildly future-proof * Add labextention
…es (dask#261) * Add GitHub Action to comment on PRs with Binder link to try out changes * Fix token * Fall back to using Actions bot instead of Dask bot * Switch back to Dask bot * Run on PR target instead of PR
* Try out Binder comment action * Update ci-binder-link-comment.yaml
I was looking into this and I thought either I am not fully grasping the fn or this is wrong. Since it is using the file itself rather than the fn. so it should have been either for file in files: or then, later on, had used "fn" instead of "file", right? Here's a link to the highlighted part: https://tutorial.dask.org/01_dataframe.html#:~:text=for%20fn%20in%20file%3A%0A%20%20%20%20df%20%3D%20pd.read_csv(os.path.join(%27data%27%2C%20%27nycflights%27%2C%20file))%0A%20%20%20%20maxes.append(df.DepDelay.max())
* Add timings for 90 min ESIP tutorial * Update pins in binder environment
Update environment.yml
* update dask-sphinx-theme * Add links to additional tutorials and resources * Change wording for Coiled tutorial
Update to reflect Coiled is no longer doing live, recurring tutorials
PR #2 squash 合并后，教程文件已与上游 dask/dask-tutorial@419c087 对齐并保留简体中文本地化，但 squash 丢掉了上游提交祖先，GitHub 仍把本 fork 显示为落后约 45 个提交（merge-base 停在 114084c）。 本提交将 upstream/main 记为第二父提交以重连历史；策略为 ours，树与当前 main 完全一致，不回滚中文译文或 fork 特有的 Binder/CI/Docker 配置。 Co-authored-by: Hao Lyu <IncubatorShokuhou@users.noreply.github.com>
|
可以用这个 Binder 链接试用本次改动。 |
IncubatorShokuhou
marked this pull request as ready for review
September 17, 2026 06:15
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
为什么要开这个 PR
#2 squash 合并后，学习者会看到的中文教程内容已经与上游 dask/dask-tutorial
main（419c087）对齐，但 squash 丢掉了上游提交祖先。当前merge-base仍停在旧的114084c，GitHub 会把本 fork 显示为落后上游约 45 个提交——这是误导性的 behind 计数，不是文件真的缺了那些改动。本 PR 只重连 git 历史，不改教程正文。
请合并到
IncubatorShokuhou/dask-tutorial-chinese的main，不要开到上游英文仓库。做了什么
在当前
main（3853d01）上对dask/dask-tutorial的main（419c087）做了一次 真实 merge commit（git merge -s ours，非 squash、非 rebase）：main419c087main完全一致（中文本地化、Binder / CI / Docker 等 fork 特有改动全部保留）试合并时冲突全部落在双方都改过的学习者可见文件（notebook、README、
prep.py、CI 等）。文件树本身已经同步，没有缺失的「仅上游有」的内容，因此采用 ours：保留 fork 上已有的中文与 fork 配置，同时把上游记入祖先。合并后 GitHub 会怎样
合并本 PR 之后（必须用 Create a merge commit）：
git merge-base --is-ancestor 419c087 main为真main...dask:dask-tutorial:main预计：ahead_by = 0，behind_by ≈ 17（fork 相对上游的中文本地化与历史重连提交）请务必不要 squash / rebase 合并
如果再次 squash 或 rebase-merge，上游祖先会再丢一次，GitHub 的 behind 计数会回到现在这样。请只用 Create a merge commit。
验证
HEAD树哈希与origin/main相同3853d01与419c08717 0（超前 17，落后 0）