Skip to content
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

Jump to bottom

Fix clearing of conflict errors #10612

Merged
merged 1 commit into from
Mar 17, 2023
Merged

Fix clearing of conflict errors #10612

merged 1 commit into from
Mar 17, 2023

Conversation

TheOneRing
Copy link
Contributor

Fixes: #10569

@TheOneRing TheOneRing requested a review from a team March 17, 2023 13:02
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

@TheOneRing TheOneRing merged commit f10f9d1 into master Mar 17, 2023
@delete-merged-branch delete-merged-branch bot deleted the work/10569 branch March 17, 2023 13:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fmoc fmoc fmoc approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[QA] conflict state is not resolved by removing the conflict file
2 participants
@TheOneRing @fmoc