So we've got 2 primary branches: main (prod) and develop. We use GitHub. The develop branch is protected: You need a PR to change develop. So on production release: develop merges to main. The code is now identical, but those two branches are not the same commit. (main has an "extra" merge commit.) I can't push to get them on the same commit:
git:(develop) ✗ git merge origin/main --ff-only
Updating bf8228b..f9c3e42
Fast-forward
2024/05/14 | James Story [email protected]
Create an AGA Hall of Fame. This could be something simple, like just announcing it via email and/or a page on the AGA website.
Create criteria for induction into the AGA Hall of Fame. Suggestions:
| #!/usr/bin/perl -s | |
| $f = $d ? -1 : 1; | |
| $D = pack('C*',33..86); | |
| $p = shift; | |
| $p =~ y/a-z/A-Z/; | |
| $U ='$D =- s/(.*)U$/U$1/; $D =~ s/U(.)/$1U/;' | |
| ($V=$U) =~ s/U/V/g; | |
| $p =~ s/[A-Z]/$k=ord($&)-64,&e/eg; | |
| $k = 0; |
| Full stack dump for https://stackoverflow.com/questions/75503034/valueerror-typeerror-cffi-backend-ffi-object-is-not-iterable-typeerror | |
| ✗ pytest --pythonwarnings ignore::DeprecationWarning -k 'test_answer_answer_answer_result' -rPF | |
| ================================================= test session starts ================================================== | |
| platform darwin -- Python 3.11.6, pytest-7.4.2, pluggy-1.3.0 | |
| plugins: anyio-3.7.1 | |
| collected 39 items / 38 deselected / 1 selected |
| ➜ Jays-2017-MacBook-Pro:argos_ghy git:(production-pipeline) ✗ curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash | |
| % Total % Received % Xferd Average Speed Time Time Time Current | |
| Dload Upload Total Spent Left Speed | |
| 100 15916 100 15916 0 0 76544 0 --:--:-- --:--:-- --:--:-- 80383 | |
| => Downloading nvm from git to '/Users/jhannah/.nvm' | |
| => Cloning into '/Users/jhannah/.nvm'... | |
| remote: Enumerating objects: 360, done. | |
| remote: Counting objects: 100% (360/360), done. | |
| remote: Compressing objects: 100% (306/306), done. | |
| remote: Total 360 (delta 41), reused 160 (delta 28), pack-reused 0 |
| $ git fetch --all | |
| Fetching upstream | |
| Fetching origin | |
| $ git show | head -1 | |
| commit adbfe44695e420f4839925d8a3cfe957f299b877 | |
| $ git show upstream/refactor-main | head -1 | |
| commit adbfe44695e420f4839925d8a3cfe957f299b877 | |
| docker container rm norse | |
| docker image rm norse |
| ----------------------------------------------------------------------------------------------- | |
| So I'm taking my Fork: | |
| https://github.com/jhannah/freshli-cli of the real repo | |
| https://github.com/corgibytes/freshli-cli | |
| And doing CRAZY SCARY STUFF to try to help. | |
| Thread: https://mastodon.social/@[email protected]/110900945626250599 | |
| Using tecniques from https://stackoverflow.com/a/37001417/4656035 |
"How about some good political news for once? Minnesota passed like 35 bills because their moderates actually decided to work with progressives to get things done" ~from Twitter thread
cool worker stuff:
cool education stuff:
| 02/27/2023 12:00 AM Antisedan Injection - 5mg/ml 1.00 | |
| 02/27/2023 12:00 AM Canine Bordetella Oral Vaccination Watch Video 1.00 | |
| 02/27/2023 12:00 AM Canine DA2PP-L Vaccination Watch Video 1.00 | |
| 02/27/2023 12:00 AM Sedation, IV Dexdomitor/Torbutrol 1.00 | |
| 02/27/2023 12:00 AM Examination w/ Vaccinations Watch Video 1.00 | |
| 02/27/2023 12:00 AM Heartworm Test, Antigen Well Watch Video Interactive Animal 1.00 | |
| 02/20/2023 12:00 AM Acepromazine 25mg 2.00 | |
| 02/20/2023 12:00 AM Examination w/ Vaccinations Watch Video 1.00 | |
| 02/20/2023 12:00 AM Gabapentin 600mg Tablets 3.00 | |
| 02/20/2023 12:00 AM Trazodone 100mg tablets 8.00 |