Skip to content

Fix handling of conflicting files in backports #50

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
moritzkiefer-da merged 1 commit into from
Apr 22, 2026
+2 −2
Merged

Fix handling of conflicting files in backports #50

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .github/workflows/backport.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ jobs:
conflicted_files=$(git diff --name-only --diff-filter=U)
if [ -n "$conflicted_files" ]; then
echo "$conflicted_files" | while IFS= read -r file; do
echo "Unstaging conflicting file $file"
git restore --staged "$file"
echo "Resetting conflicting file $file"
git reset "$file"
done
fi
git commit --author="$(git show -s --format='%an <%ae>' $commit_sha)" \
Expand Down
Loading