Skip to content

Conversation

@susnux
Copy link
Contributor

@susnux susnux commented Dec 15, 2025

The component expects incoming and existing arrays, so the openConflictDialog has to pass them correctly.

The component expects `incoming` and `existing` arrays,
so the `openConflictDialog` has to pass them correctly.

Signed-off-by: Ferdinand Thiessen <[email protected]>
@susnux susnux requested review from artonge and nfebe December 15, 2025 12:31
@susnux susnux added bug Something isn't working 3. to review labels Dec 15, 2025
@codecov
Copy link

codecov bot commented Dec 15, 2025

Codecov Report

❌ Patch coverage is 0% with 6 lines in your changes missing coverage. Please review.
✅ Project coverage is 45.43%. Comparing base (f6b4bbf) to head (5dbe1db).
⚠️ Report is 39 commits behind head on main.

Files with missing lines Patch % Lines
lib/conflict-picker.ts 0.00% 5 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2159      +/-   ##
==========================================
- Coverage   45.85%   45.43%   -0.42%     
==========================================
  Files          15       15              
  Lines         434      438       +4     
  Branches       84       85       +1     
==========================================
  Hits          199      199              
- Misses        207      210       +3     
- Partials       28       29       +1     

☔ View full report in Codecov by Sentry.
📢 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.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@susnux susnux merged commit 6b08743 into main Dec 16, 2025
12 of 14 checks passed
@susnux susnux deleted the fix/conflict-picker branch December 16, 2025 09:55
@susnux susnux mentioned this pull request Dec 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants