Skip to content

resolve update conflict#2

Closed
SkyLull wants to merge 119 commits into
argparsefrom
3.13-argparse-conflict-resolving
Closed

resolve update conflict#2
SkyLull wants to merge 119 commits into
argparsefrom
3.13-argparse-conflict-resolving

Conversation

@SkyLull
Copy link
Copy Markdown
Owner

@SkyLull SkyLull commented Aug 30, 2025

No description provided.

mattwang44 and others added 30 commits November 16, 2024 15:39
Co-authored-by: Wei-Hsiang (Matt) Wang <[email protected]>
* translate `library/sys.monitoring.po`

* Apply suggestions from code review

Co-authored-by: mindihx <[email protected]>

---------

Co-authored-by: mindihx <[email protected]>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Wei-Hsiang (Matt) Wang <[email protected]>
…4.7.1 (python#1003)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: W. H. Wang <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Update translation for library/pathlib.po

* Refine translation for library/pathlib.po

* Update translation of `pattern` in library/pathlib.po
Bumps [JamesIves/github-pages-deploy-action](https://github.com/jamesives/github-pages-deploy-action) from 4.7.2 to 4.7.3.
- [Release notes](https://github.com/jamesives/github-pages-deploy-action/releases)
- [Commits](JamesIves/github-pages-deploy-action@v4.7.2...v4.7.3)

---
updated-dependencies:
- dependency-name: JamesIves/github-pages-deploy-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Copilot AI and others added 29 commits July 14, 2025 11:17
Co-authored-by: mattwang44 <[email protected]>
Co-authored-by: copilot-swe-agent[bot] <[email protected]>
Co-authored-by: mattwang44 <[email protected]>
Co-authored-by: copilot-swe-agent[bot] <[email protected]>
Co-authored-by: W. H. Wang <[email protected]>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: W. H. Wang <[email protected]>
Co-authored-by: Copilot <[email protected]>
Co-authored-by: W. H. Wang <[email protected]>
…ython#1110)

Co-authored-by: josix <[email protected]>
Co-authored-by: mattwang44 <[email protected]>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: copilot-swe-agent[bot] <[email protected]>
Co-authored-by: Josix <[email protected]>
Co-authored-by: mattwang44 <[email protected]>
Co-authored-by: copilot-swe-agent[bot] <[email protected]>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Matt Wang <[email protected]>
feat: deploy PR preview to gh pages
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Matt Wang <[email protected]>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Matt Wang <[email protected]>
@SkyLull SkyLull closed this Aug 30, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.