chore: 上流リポジトリの変更を取り込むためのGithub Actionsのworkflowを追加 #332
+105
−0
Conversation
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
3w36zj6
requested review from
Copilot,
gomazarashi,
kimushun1101 and
ultimatile
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR automates the process of merging upstream changes from the typst/typst repository by adding a GitHub Actions workflow. Previously, this merge process was performed manually with each new Typst release.
Key Changes:
- Added a workflow that creates a PR with upstream changes, including conflict markers for manual resolution
- Configured Git merge strategies to preserve repository-specific files during upstream merges
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 4 comments.
| File | Description |
|---|---|
.github/workflows/merge-upstream.yml |
GitHub Actions workflow that fetches upstream changes, attempts merge with conflict preservation, and creates a PR with conflict detection |
.gitattributes |
Defines merge strategies to keep repository-specific files (workflows, templates, README) unchanged during upstream merges |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
3w36zj6
commented
Oct 26, 2025
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.
変更点
確認方法
v0.14.0）を入力し実行する