Skip to content

Fixing conflict resolution and improving logging - #138

Merged
AndreasIgel merged 5 commits into
mainfrom
feature/improve-conflict-resolution
Mar 15, 2026
Merged

AndreasIgel merged 5 commits into
mainfrom
feature/improve-conflict-resolution

Conversation

@AndreasIgel

Copy link
Copy Markdown
Collaborator

Getting result of conflict resolution stable to solve #132

@github-actions

github-actions Bot commented Mar 15, 2026 •

Copy link
Copy Markdown
Contributor

Dependency Review

✅ No vulnerabilities or license issues or OpenSSF Scorecard issues found.

Snapshot Warnings

⚠️: No snapshots were found for the head SHA bc49b9f.
Ensure that dependencies are being submitted on PR branches and consider enabling retry-on-snapshot-warnings. See the documentation for more information and troubleshooting advice.

Scanned Files

None

@codecov

codecov Bot commented Mar 15, 2026 •

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ All tests successful. No failed tests found.

📢 Thoughts on this report? Let us know!

@sonarqubecloud

Copy link
Copy Markdown

@AndreasIgel
AndreasIgel merged commit 9cd0918 into main Mar 15, 2026
7 checks passed
@AndreasIgel
AndreasIgel deleted the feature/improve-conflict-resolution branch March 15, 2026 21:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant