Let me know if you have any issues. I think this rebase approach works well, and I’d be happy to do it on https://github.com/zynthian/mod-ui if I had push permissions to that repo
I just sent you an invitation for “maintainer” role on zynthian’s mod-ui repo. You are really welcome to keep updated this repo. In fact, the build system currently uses your repository, so you are the “de-facto” maintainer
Tell me when i can change the “build-script” for using the zynthian’s repo again.
Of course, don’t hesitate to ask me for help/advice when the zynthian’s mod-ui engine need “updating” (although it seems you understand quite well this piece of code … )
Hello Steveb,
I just installed fresh.
did update through webui
there was an error regarding unmerged files for mod-ui
merged it but now there are still unmerged commits
I used:
2020-09-05-zynthianos-buster-lite-armhf-1.0.0
as installation source
On branch zyn-mod-merge
Your branch is ahead of ‘origin/zyn-mod-merge’ by 7 commits.
(use “git push” to publish your local commits)
nothing to commit, working tree clean
git log:
git log --pretty -a
commit ce8ed8e7187060f5aea9782550946b0ef7675bcf (HEAD -> zyn-mod-merge)
Merge: ca87446b b8216b9c
Author: Björn Thorwirth moonstruxx@googlemail.com
Date: Tue Nov 17 12:40:57 2020 +0000
Merge branch 'zyn-mod-merge' of https://github.com/steveb/mod-ui into zyn-mod-merge