git mindfuck of the day:
• While merging branch B into branch A, A is “ours”, B is “theirs” (changes from B are reflected in A)
• When rebasing branch B on top of branch A, A is ”ours”, B is “theirs” (changes from A are reflected in B)
No more spending time on merge conflicts!
**mergiraf**: Solves Git conflicts automatically.
Uses AST of the language to do syntax-aware merging.
Written in Rust & supports many languages!
Docs: https://mergiraf.org/
#Trump transition team exploring ways to significantly #reduce, #merge, or even #eliminate top #bank #regulators in Washington WSJ reported on Thursday.. In recent interviews with potential candidates for leading these regulatory agencies, Trump advisers and officials from the newly established Department of Government Efficiency #DOGE have inquired about the possibility of the president-elect abolishing the #FDIC #banking #financialcrisis #financialstability #finance #economy #WallStreet
Wacky vs. Teamwork: Bogo Sort vs. Merge Sort
Can random guessing beat divide & conquer? This sorting showdown is pure MADNESS! Don't miss the results! https://hasty.dev/blog/sorting/bogo-vs-merge?utm_source=mastodon&utm_medium=social&utm_campaign=fedica-Default
Teamwork vs. Picky Picker
: Merge vs. Selection Sort
Can collaboration conquer meticulousness? This sorting showdown is a battle of strategies! https://hasty.dev/blog/sorting/merge-vs-selection?utm_source=mastodon&utm_medium=social&utm_campaign=fedica-Default
Merge vs. Quick Sort: Teamwork vs. Speedy Swordsman? ️
Can the collaborative Merge Sort outduel the lightning-fast Quick Sort? This sorting showdown is a real CLASH! https://hasty.dev/blog/sorting/merge-vs-quick?utm_source=mastodon&utm_medium=social&utm_campaign=fedica-Default
Heap vs. Merge Sort: A Sorting Showdown! vs.
️
Who will win? This sorting battle promises to be EPIC! https://hasty.dev/blog/sorting/heap-vs-merge?utm_source=mastodon&utm_medium=social&utm_campaign=fedica-Default
Sleep Sort vs. Merge Sort: Can Sleep Win? vs. ️
Merge Sort: Blazing fast, divides & conquers! ️
Sleep Sort: The underdog... with a sleep-based trick!
Who wins? It's a shocker! https://hasty.dev/blog/sorting/merge-vs-sleep?utm_source=mastodon&utm_medium=social&utm_campaign=fedica-Default
Bubble vs Merge Sort (Who Wins?)
Is slow and steady the way to go in sorting algorithms? This post throws Bubble Sort and Merge Sort into the ring for an epic showdown!
Read who emerges victorious! https://hasty.dev/blog/sorting/bubble-vs-merge?utm_source=mastodon&utm_medium=social&utm_campaign=fedica-Default
Bucket vs Merge Sort: Sorting Showdown
Which reigns supreme for efficiency? Buckle up for a battle of the sorting algorithms! https://hasty.dev/blog/sorting/bucket-vs-merge?utm_source=mastodon&utm_medium=social&utm_campaign=fedica-Default
Study came out last month, sez Yeah, we know 10-30% of ppl who got COVID will get Long-COVID. But we're finding that 50 to 70%(!) of ppl who got COVID have organ or organs damaged, and have no idea!
#MaskUp #CovidKills #MasksWork #permanent #scarring #lungs #heart #murmur #intestine #damage #reduced #function #brain #cells #merge #lower #cognitive #ability #age #premature #aging #liver #kidney #LongCovid #risk #women #children #adolescent #respirator #mask #face #shield https://whn.global/scientific/spectrum-of-covid-19-from-asymptomatic-organ-damage-to-long-covid-syndrome/?fbclid=IwZXh0bgNhZW0CMTAAAR0FEWVKJ3P1xqBfUk30Q-ylF0Gs-GMns_H_HyNobTzjIji26m5w8B_La9k_aem_AXxP73QhzqaaByJ-1FwV7J9oIeg42g75GtmFbgrKVRdji21kzjbKLOI1wmUpyJXKkg1njcLvlP34JcUtSuAlSxM2
If you could merge two different animals to create the ultimate animal, what two animals would it be and what would be their product?
#CriticalQuestions #Quiz #PubQuiz #Animals #Merge #Ultimate #StayHome #StaySafe #StayHomeStaySafe
Norwescon 46 Thursday Dance: Fandom Mash with DJ Wüdi: It’s the Thursday night dance! (#AHa #AndOne #AndrewVanVlear #Apeboy #Argules #AssortedIntricacies #Ayria #BoneyM #BryanBowers #Cartymix #CharliXCX #CJBolland #DaftPunk #DanAvidan #De-Vision #DeadOrAlive #DJATeam #DJChidow #DJCummerbund #DJWüdi #DJYAliasJY #DNCE #Edelweiss #Eurythmics #fnogg #FrankieValliAndTheFourSeasons #G3rst #GeorgeLamond #Grimes #Groboclone #HappyCatDisco #IconaPop #InformationSociety #JanelleMonáe #KateBush #Kesha #Lloyd #LMFAO #MelodikaBros #Melodysheep #Merge #Modulate #Myūjikku #NTrance #NewOrder #NickiMinaj #NineInchNails #Norwescon #NWC46 #PartyBen #Pheugoo #RealLife #RobinSkouteris #ShinyToyGuns #TheImmortals #TheRockyHorrorPictureShow #TheTimelords #TheTingTings #TomJones #TWRP #Underworld #VCMG #VenusHum #WeirdAlYankovic #Ylvis)
DJ Wüdi's Full post: https://www.djwudi.com/djwudi/2024/04/01/norwescon-46-thursday-dance-fandom-mash-with-dj-wudi/
I am sure there will still be some tweaking to do so I'm not leaping into anything else yet. But I do want to move my Mastodon and Pixelfed instances to this webserver. That will only be possible using Docker, which I am not familiar with. So more learning is to come. I would like to do it sooner rather than later but perhaps it’ll be a PD project for work in the summer.
Thanks again to the folks who reached out with Firefox tips. Things are moving along and I'm learning, which is why I like to do this kind of thing. My new #Debian 12 webserver #tabarnix is coming together!
I was a little frustrated this morning with some wordpress configuration for NGinx and how ISPConfig did (or didn’t) apply the needed directives. But I get it now and it's working!
For posterity and for the benefit of the Inter-webs, here's some NGinx snippets that I'm using in ISPConfig. Because it controls the host files but also gives the admin the ability to add directives, they have a “merge” feature. You'll see it in the php directive. Don't use that in a regular nginx host file.
I needed to set the client_body_size and buffer directives to get Wordpress happy (eliminate JSON errors when save/updating/adding images) in addition to the index.php directive to allow for permalinks.
I also updated my knowledge about enabling directory listings in NGinx with the use of a regular expression.
#####
client_max_body_size 100M;
location / {
try_files $uri $uri/ /index.php?$args;
}
location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ {
expires max;
log_not_found off;
}
location @php { ##merge##
fastcgi_buffers 256 16k;
fastcgi_buffer_size 128k;
fastcgi_busy_buffers_size 256k;
}
location ~ ^/(NOAA|ECCC|fire)/ {
autoindex on;
autoindex_exact_size off;
autoindex_format html;
autoindex_localtime on;
}
###
This is all on my https://alberniweather.ca website/blog.
The webserver is performing well! Fast and reliable!
Good Times!
#WebAdmin #WebServer #NGinx #ISPConfig #OpenSource #Linux
@aristeon89 @uspolitics @politicalscience @geopolitics @histodons @history @sociology
COULD THIS MERGER GIVE #TRUMP THE $500 MILLION HE NEEDS?
7/14
If you want to watch the virtual shareholder meeting, here is the link:
https://east.virtualshareholdermeeting.com/vsm/web?pvskey=DWAC2024SM
If it is approved, the companies will #merge and Trump will own 69% of the new entity based on his 79 million shares of the merged company. His share will be worth about $3.8 #billion, based on the closing price Friday.