fix(upload): properly handle skipped files - #1722
Merged
Merged
Conversation
4 tasks
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #1722 +/- ##
==========================================
+ Coverage 87.01% 87.37% +0.36%
==========================================
Files 44 44
Lines 1109 1117 +8
Branches 278 281 +3
==========================================
+ Hits 965 976 +11
+ Misses 106 105 -1
+ Partials 38 36 -2 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
susnux
requested review from
CarlSchwan and
kristian-zendato
and removed request for
CarlSchwan
August 20, 2026 12:44
pringelmann
reviewed
Aug 24, 2026
If a file was skipped in the conflict resolution it must not be uploaded. Previously only renamed nodes were handled. Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
pringelmann
approved these changes
Aug 25, 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.
If a file was skipped in the conflict resolution it must not be uploaded. Previously only renamed nodes were handled.
🤖 AI (if applicable)