Skip to content

fix(upload): properly handle skipped files - #1722

Merged
susnux merged 2 commits into
mainfrom
fix/file-tree
Aug 25, 2026
Merged

fix(upload): properly handle skipped files#1722
susnux merged 2 commits into
mainfrom
fix/file-tree

Conversation

@susnux

@susnux susnux commented Aug 19, 2026

Copy link
Copy Markdown
Contributor

If a file was skipped in the conflict resolution it must not be uploaded. Previously only renamed nodes were handled.

🤖 AI (if applicable)

  • The content of this PR was partly or fully generated using AI

@susnux susnux added type: bug 🐛 Something isn't working 3. to review 3️⃣ Waiting for reviews labels Aug 19, 2026
@codecov

codecov Bot commented Aug 20, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 87.37%. Comparing base (9604d56) to head (ee16ab2).

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.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@susnux
susnux requested review from CarlSchwan and kristian-zendato and removed request for CarlSchwan August 20, 2026 12:44
Comment thread lib/upload/uploader/UploadFileTree.ts
susnux added 2 commits August 24, 2026 21:43
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>
@susnux
susnux merged commit 4503069 into main Aug 25, 2026
13 checks passed
@susnux
susnux deleted the fix/file-tree branch August 25, 2026 18:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review 3️⃣ Waiting for reviews type: bug 🐛 Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants