Mergeconflict fix and decompiled again for new Ableton version 11.3.12#12
Open
Ideae wants to merge 2 commits into
Open
Mergeconflict fix and decompiled again for new Ableton version 11.3.12#12Ideae wants to merge 2 commits into
Ideae wants to merge 2 commits into
Conversation
… using decomyle3 version 3.9.0. Deleted compiled pyc files.
|
Can somebody please merge this in |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
The repository had a merge conflict on each file (as mentioned in issue #8 previously), which led to a state where git would not recognize it to perform the conflict resolution. I have fixed this issue by performing the decompilation process over again using decompyle3, in order to match the new version of Ableton 11.3.12. Please let me know if there is any additional work I can do.
Thanks for doing the original work on this, and putting up the API spec online. It has been a big help to me.
Credit to @LiamAttClarke for helping with this effort.