Skip to content

chore: 上流のマージ時に削除済みファイルを維持するように修正 #379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
3w36zj6 merged 3 commits into from
Jun 23, 2026
Merged

chore: 上流のマージ時に削除済みファイルを維持するように修正 #379

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea6e7cc
chore: 上流のマージ時に削除済みファイルを維持するように修正
3w36zj6 Mar 12, 2026
8d1f37c
chore: 上流のマージ時に削除済みファイルの維持対象を修正
3w36zj6 Jun 23, 2026
e78dab5
chore: 上流のマージ時に削除済みファイルの維持対象を調整
3w36zj6 Jun 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/workflows/merge-upstream.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ jobs:
git checkout HEAD -- .github/
git reset HEAD .github/

# Resolve files deleted upstream in delete/modify conflicts
git status --porcelain=v1 -z | while IFS= read -r -d '' entry; do
case "$entry" in
"UD "*) git rm -- "${entry#UD }" ;;
esac
Comment on lines +50 to +52
done

# Commit the merge with conflict markers
git commit -a -m "Merge upstream changes from ${{ github.event.inputs.upstream_ref }}"

Expand Down
Loading