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.
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.