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.

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

#1130: improve using variable FAIL_ON_AMBIGOUS_MERGE incl. documentat… #1158

Merged

Conversation

hohwille
Copy link
Member

@hohwille hohwille commented Mar 21, 2025

fixes #1130
improvement for PR #1138

  • improve using variable FAIL_ON_AMBIGOUS_MERGE
  • add documentation
  • add test
  • follow best-practice to have test (XmlMergerTest) in the same package as the tested class (XmlMerger)
  • also renamed the package com.devonfw.tools.ide.merge.xmlmerger to com.devonfw.tools.ide.merge.xml following DRY principle.

@hohwille hohwille added enhancement New feature or request configuration should be configurable or configuration change merger labels Mar 21, 2025
@hohwille hohwille added this to the release:2025.03.002 milestone Mar 21, 2025
@hohwille hohwille merged commit af1f59a into devonfw:main Mar 21, 2025
3 checks passed
@coveralls
Copy link
Collaborator

Pull Request Test Coverage Report for Build 13999873361

Warning: This coverage report may be inaccurate.

This pull request's base commit is no longer the HEAD commit of its target branch. This means it includes changes from outside the original pull request, including, potentially, unrelated coverage changes.

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage increased (+0.07%) to 67.738%

Totals Coverage Status
Change from base Build 13998949209: 0.07%
Covered Lines: 7838
Relevant Lines: 11144

💛 - Coveralls

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
configuration should be configurable or configuration change enhancement New feature or request merger
Projects
Status: ✅ Done
Development

Successfully merging this pull request may close these issues.

improve behaviour on ambiguous XPath match
3 participants