Improve merge failed error (FE)
What does this MR do?
Improves the merge failed error handling
Issue #30141 (closed)
Screenshots (strongly suggested)
Does this MR meet the acceptance criteria?
Conformity
Availability and Testing
Edited by Jacques Erasmus