chore: 上流のマージ時に削除済みファイルを維持するように修正#379
Merged
Merged
Conversation
3w36zj6
force-pushed
the
feature/auto-resolve-deleted-conflicts
branch
from
0fdd432 to
ea6e7cc
Compare
3w36zj6
requested review from
gomazarashi,
kimushun1101 and
ultimatile
as code owners
Comment on lines
+48
to
+53
| # Keep "deleted by us" files deleted | ||
| git status --porcelain=v1 -z | while IFS= read -r -d '' entry; do | ||
| case "$entry" in | ||
| "DU "*) git rm -- "${entry#DU }" ;; | ||
| esac | ||
| done |
Comment on lines
+50
to
+53
| case "$entry" in | ||
| "DU "*) git rm -- "${entry#DU }" ;; | ||
| "UD "*) git rm -- "${entry#UD }" ;; | ||
| esac |
ultimatile
approved these changes
Jun 23, 2026
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.
上流リポジトリで削除されたファイルが意図せず残ることを防ぐためのマージ用のworkflowの修正です。