search

nightscout / Trio

MIT License
45 stars 125 forks source link

Merge `alpha` into `dev` #333

Closed MikePlante1 closed 5 days ago

MikePlante1 commented 1 week ago
marionbarker commented 1 week ago

Summary

Success. LGTM.

Details

I tested this in my local clone using CLI. Clone was already at alpha, commit 3ec6176d.

 1038  git switch dev
 1039  git pull --recurse
 1040  git switch -c dev_merge_alpha
 1041  git merge alpha
 1042  git submodule update

At this point, git status -v returns no changes At this point, git diff alpha dev_merge_alpha returns no changes

Furthermore, alpha and dev_merge_alpha have the same SHA. (gl is an alias for git log --oneline)

Trio % gl -3
3ec6176d (HEAD -> dev_merge_alpha, origin/alpha, dnzxy/alpha, alpha) Merge pull request #330 from loopandlearn/update_CGMBLEKit_submodule

As a final test, I built Trio onto an existing phone instance and it works as expected.