ive a couple of problems with the changes you made to install_bela.sh
a) it relies on a newer version of git.... for --show-current
thats no problem, we can install git from homebrew
b) the merge is always failing for me.
this is because there are a ton of file that are not ignored (as Ive pointed out before), as so git creates a merge conflict
I could do a
git reset --hard
git clean -fxd
seems a bit drastic, but would get to the state where the two images are aligned...
(which I think was the purpose of your change)
EDIT: another slight problem.... but perhaps is ok
so you are doing
git push $XC_SSH:Bela $BRANCH:tmp-$BRANCH
which you then merge....
first this seems for some reason to create a lot of commits on the bela board,
e.g. even though I reset both on mac and on bela, after this merge bela board things its ahead by 1102 commits on master!?
Im not sure this matters, as I never push from the bela board to github
git push will only push committed changes
so its still possible that you have change in your local ~/xcBela that will not push to bela
(I found this out the hard way, when I was editing the Makefile locally, then was confused why
make lib still buidl the old library)
perhaps if we really want the ~/Bela and ~/xcBela/Bela to be the same, we should rsync the changes over?
(excluding ~/Bela/projects )