With my-awesome-work
branch checked out:
What you want to do | git merge master | git rebase master |
---|---|---|
Keep changes from master |
-Xtheirs | -Xours |
Keep changes from my-awesome-work |
-Xours | -Xtheirs |
With my-awesome-work
branch checked out:
What you want to do | git merge master | git rebase master |
---|---|---|
Keep changes from master |
-Xtheirs | -Xours |
Keep changes from my-awesome-work |
-Xours | -Xtheirs |
flowchart TD
A[fa:fa-users Client] -->|HTTP Request|B{"fa:fa-shield-alt Vanguard (Frontend)"}
B -->|Proxy HTTP Request - SSL self signed|C
C((fa:fa-pastafarianism Web Drone Army))
B -->|Service Subdomain Request|F
F -->|"Website Info (sans SSL certs)"|C
C -->|Log Info|F
F -->|"Web Drone Army Info (w/ SSL certs)"|B
F("fa:fa-space-shuttle Mothership (Single Source of Truth Backend)")
flowchart LR
A[fa:fa-users WHM]
A --> B["fa:fa-user cPanel (user 1 - “classic” setup)"]
A --> C["fa:fa-user cPanel (user 2 - major web needs; DNS/mail handled via registrar)"]
A --> D["fa:fa-user cPanel (user 3 — complex needs)"]
B --> E["Web"]
B --> F["Email"]
B --> G["MySQL"]
B --> H["DNS"]
Houston homes are not built for freezing weather. Winter Storm Uri in Feb 2021 proved that and I never want to go through that again!
So instead of the trickling outlets approach (which did not prevent our pipe burst) we will be shutting off water during the freeze.
I've been working on this idea off and on for a while and tonight Rhiannon had a suggestion that just fell into place. The end result:
Have my echo automatically tell me about a given calendar’s events when its time comes (and any remind-me-X-before reminders that they have attached to them if possible).
Example: Say I have a Big Important Meeting at 1pm with a remind-me-notification 5 minutes before set.
Here is my findings/opinion as of Oct 2023:
UTM, like Virtual Box, runs the OS in a window in macOS (as opposed to rebooting into the OS like bootcamp). Personally, I find the window approach far more convenient than rebooting.
Too Long; Didn’t Read
Its when there is a lot of detail that people may tend to ignore or not completely grok due to the sheer volume.
I typically use it in electronic communication to indicate a conscise summary for them to get the main take aways while also roviding details later for any one interested in them.