Tootfinder

Something that just drives me up the wall about this particular area of Git (merge conflicts) is that, beyond the all-too-typical Git problem of sloppy terminology, this is bad feature design. In most situations, “use ours” and “user theirs” are •both• the wrong answer! There are two doors, and they’re •both• trapdoors.
If you have a merge conflict, that means that you changed something •and• somebody else changed something, and your job is to •synthesize• both changes. To use one is to discard the other, which is usually not what you want!
The thing Git (and every Git GUI) ought to surface is a three-way merge: show me what I changed and what they changed ••relative to the nearest common ancestor••. Yes yes yes, I know it’s possible to finagle that into view with Git. It should be the danged default. It is what I should see first. It is what I should see if I have no idea what I’m doing.
1/ https://hachyderm.io/@jeremydmiller/115741417416659492

xAI's Grok 4.1 tops benchmarks in emotional intelligence, while its model card also shows a marked increase in sycophancy compared to Grok 4 (Christopher Ort/i10X)
https://i10x.ai/news/grok-4-1-eq-bench-empathy-sycophancy-paradox

Grok 4.1 Tops EQ-Bench: Empathy vs Sycophancy Trade-Off
xAI's Grok 4.1 leads EQ-Bench3 in emotional intelligence through roleplay scenarios, but shows increased sycophancy. Explore the paradox of optimizing empathy at the cost of truthfulness and its implications for AI deployment in wellness and support apps. Discover the key insights.

Not that you needed another reason but …
https://krcgtv.com/news/nation-world/california-protester-left-blind-in-one-eye-is-among-string-of-violent-run-ins-with-ice

California protester left blind in one eye is among string of violent run-ins with ICE
A 21-year-old college student who said he was blinded in one eye by a projectile fired by a federal officer during a Southern California protest said he faces a

@governorwalz.mn.gov
Pay attention to which direction police are facing
If police are facing, for example, ICE, then they're deployed AGAINST ICE & protecting citizens
Facing the citizens? They're deployed AGAINST citizens & protecting ICE
This is what we see
Choose your citizens to protect

Governor Tim Walz (@governorwalz.mn.gov)
Stay safe and stay peaceful today. Our public safety team has the resources, coordination, and personnel on the ground to maintain public safety and respond if needed. Thanks to local law enforcement for keeping the peace. https://www.cbsnews.com/minnesota/live-updates/minnesota-protests-ice-shooting-law-enforcement/

The joy of commercial big data. Thomson Reuters helps ICE to see in realtime which drivers are Democrats.
https://www.404media.co/this-app-lets-ice-track-vehicles-and-owners-across-the-country/

This App Lets ICE Track Vehicles and Owners Across the Country
Material viewed by 404 Media shows data giant Thomson Reuters enriches license plate data with marriage, voter, and ownership records. The tool can predict where a car may be in the future.

NFL predictions: NFC North race is wide open entering Week 16

https://www.cbssports.com/betting/news/nfl-predictions-nfc-north-race-is-wide-open-entering-week-16/

Five Big Questions (and Zero Predictions) for the U.S. Privacy and AI Landscape in 2026
https://fpf.org/blog/five-big-questions-and-zero-predictions-for-the-u-s-privacy-and-ai-landscape-in-2026/

DOJ vowed to punish those who disrupt Trump's immigration crackdown. Dozens of cases have crumbled
https://apnews.com/article/ice-immigration-protests-prosecutions-doj-arrests-591f155d50c13756842e033ea23f16d3

Dozens of felony cases have crumbled in DOJ's push to punish protesters
The Justice Department has embarked on a months-long effort to prosecute people accused of assaulting federal officers during protests of President Donald Trump’s immigration policies. Attorney General Pam Bondi has vowed such offenders will face “severe consequences.” But DOJ has struggled to deliver on that commitment, according to a review by The Associated Press of 166 federal criminal cases brought since May against protesters in four Democratic-led cities at the epicenter of demonst…

Coinbase is rolling out stock trading, more advanced trading tools, prediction markets via Kalshi, and more, amid a push to be a one-stop financial app (MacKenzie Sigalos/CNBC)
https://www.cnbc.com/2025/12/17/coinbase-prediction-markets-stock-tradin…

Coinbase adds prediction markets and stock trading in push to be one-stop trading app
Coinbase is expanding into stocks, advanced trading, prediction markets, and new tools for businesses, developers, and automated financial guidance.