Skip to content

test: merge order for lecture-python-programming translation PRs (v0.12.3 validation) #48

Description

@mmcky

Context

v0.12.3 of action-translation is now deployed across all three repos. The scoped PR behavior has been validated — translation PRs now only contain the source PR's actual changes and skip sections pending earlier translation PRs.

We have two open translation PRs on each target repo that need to be merged in the correct order.

Open Translation PRs

lecture-python-programming.zh-cn

Order PR Source PR Description
1st #6 #488 Add Type Hints section to python_advanced_features.md
2nd #9 #491 Fix broken raw GitHub URLs in pandas.md + python_advanced_features.md

lecture-python-programming.fa

Order PR Source PR Description
1st #73 #488 Add Type Hints section to python_advanced_features.md
2nd #76 #491 Fix broken raw GitHub URLs in pandas.md + python_advanced_features.md

Merge Order & Steps

Step 1: Merge the "earlier" PRs first (zh-cn #6, fa #73)

These PRs add the Type hints section to python_advanced_features.md. They must be merged first because the "later" PRs (#9, #76) explicitly skipped this section (shown in their ⚠️ Sections Pending Earlier Translation PR notice).

  1. Review zh-cn #6 — get team feedback
  2. Merge zh-cn Add test case for MyST target anchors before title heading #6
  3. Review and merge fa #73

Step 2: Merge the "later" PRs (zh-cn #9, fa #76)

These PRs contain URL fixes scoped to only the changes from source PR #491. They should merge cleanly on top of Step 1 via Git's 3-way merge.

  1. After Step 1, check zh-cn #9 for merge conflicts — there should be none
  2. Merge zh-cn Add Hindi glossary (hi.json) #9
  3. Check and merge fa #76

Step 3: Verify final state

After both PRs are merged on each target:

  • python_advanced_features.md has the Type hints section AND the URL fixes
  • pandas.md has the URL fixes
  • Heading-map in python_advanced_features.md includes entries for all sections including Type hints
  • No duplicate content or missing sections
  • .translate/state/*.yml files are up to date

What if there are merge conflicts?

If #9 or #76 conflict after merging #6 or #73 (unlikely but possible if both touched the same lines), the conflicts should be minor frontmatter/heading-map conflicts resolvable via GitHub's conflict editor.

Recovery

If an earlier PR (#6 or #73) is abandoned instead of merged, comment \translate-resync on the original source PR #488 to regenerate a full translation including the skipped sections.

Metadata

Metadata

Assignees

No one assigned

    Labels

    testingTesting and unlikely to merge

    Type

    No type
    No fields configured for issues without a type.

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions