Join GitHub today
GitHub is home to over 40 million developers working together to host and review code, manage projects, and build software together.Sign up
Ignore conflicts between versions of same mod #2430
When we upgrade, we ask the
Prior to #2339, this was avoided by ignoring conflicts if the identifiers were the same, but when we made conflicts version-specific, we only ignored that conflict if the identifier and version are the same.
A test is added to catch regressions.