Right now we are at the point where "develop" is our working stable build, so we should just merge it into main. I'll rename our current super unstable branch to a develop/comp branch and then we can work off of that.
I really want to avoid branches exploding like this again, since we kept branching off of branches and it got confusing
Merging develop/shepherd-fw into main
Right now we are at the point where "develop" is our working stable build, so we should just merge it into main. I'll rename our current super unstable branch to a develop/comp branch and then we can work off of that.
I really want to avoid branches exploding like this again, since we kept branching off of branches and it got confusing