added cmake check for ARM and updated bash lines #206
Closed
jahway603
wants to merge 18 commits from jahway603:dev into dev
Loading…
Reference in new issue
There is no content yet.
Delete Branch 'jahway603:dev'
Deleting a branch is permanent. It CANNOT be undone. Continue?
added cmake check for ARM and updated bash lines
idk wtf happened with this pull request & first time using git stash, so who knows
@jahway603 it's because you had an out of date dev branch and I did some of the stuff you did, so your changes created merge conflicts in many files. Git stash wasn't the culprit here
@jahway603 I suggest just working directly on the hush3.git dev branch and redo your change to check for cmake in build-arm.sh there. One way to "replay" your commit onto that branch is to do
if you are working in a local git repo that has your commit in it. Or just copy+paste 😄
@jahway603 the reason this happened is because you made your single commit before doing "git pull", which changes the commit hashes of all subsequent commits. If you had done a "git pull" first then done your commit, this would have worked perfectly. Always "git pull" first, or like the git community says "always pull before you push" 😄
This PR is fubar, it's much easier to start again than fix this. Closing out