fix: try resolving conflicts by using getNewMappedName
#147
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves architectury/architectury-loom#283
We’re seeing this conflict error:
The only unfixable conflict is:
It should prefer
kl/method_57826, but currently doesn't.This PR adds an alternative conflict resolution strategy: if all existing checks fail (e.g. parent-based), we fall back to resolving by
member.cls.getName() + "/" + member.getNewMappedName().This change is non-breaking and only runs as a last resort. It fixes the above issue without altering existing behaviour.