Skins 16/64 samplers :: re-sync skin.xml & skin_settings #2218
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thank you for fixing this. I think we need help from the original contributor if skin conflicts have evolved to do it right. An other issue can be pending PRs with conflicts to master. |
|
I can confirm that the issue is fixed. Thank you. LGTM. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
skin.xml in both Deere's and Tango's 16/64 samplers versions have diverged, probably after merging 2.2 into master (I'm too lazy to investigate..)
discovered while fixing https://bugs.launchpad.net/mixxx/+bug/1837716
IIRC this is not the first time, and fixing those screw-ups is tedious.
Can we somehow exclude /res/skins when any other mixxx branch is merged into master?
Obviously, this should be decided per merge, as for example lib-redesign conatins fundamental skin changes, but skin fixes in 2.2 are not relevant for master AFAICT because skins in master are usually fine.
or: can /res/skins/ be excluded as soon as merge conflicts in skins pop up?