conflict resolution

Martin Kleppmann's GOTO Berlin 2016 talk on how collaborative editors, offline apps, and multi-datacenter databases handle concurrent updates. It covers conflict resolution approaches including operational transformation and CRDTs, with a worked look at text CRDTs.

A roughly three-hour San Francisco workshop by Marshall Rosenberg on Nonviolent Communication, with full English subtitles added by a fan. He teaches the model with his jackal and giraffe language examples.

George Friedman of Stratfor speaks at the Chicago Council on Global Affairs about flashpoints in Europe that he expects to erupt again, including borderlands and cultural fault lines.

A 56-minute fake BBC nuclear attack news broadcast originally made by Ben Marking, re-uploaded in full resolution. It is a fictional breaking-news special depicting nuclear war, and the uploader states it is not real.

Martin von Zweigbergk presents Jujutsu (jj), a Git-compatible VCS with undo, anonymous branches, first-class conflicts, automatic rebasing, and the working copy as a commit. He also covers plans at Google.

CGP Grey argues for picking a theme for the year or season instead of setting goals or new year's resolutions. He explains how a theme gives direction without a pass/fail target.

A recording of the leaked 2014 phone call between US diplomat Victoria Nuland and ambassador Geoffrey Pyatt about the future of Ukraine's government, republished by The Tribune.

Scott Manley's short animation shows every asteroid discovery from 1970 to 2015 plotted over time in 8K. It makes visible how survey technology made discoveries accelerate and where telescopes looked.

A short clip about DARPA's ARGUS-IS, a 1.8 gigapixel wide-area camera array flown on a Boeing unmanned helicopter. It produces a huge mosaic video that can watch a city-sized area from 20,000 feet.

A five-minute clip from The Big Short (2015) in which FrontPoint Partners confront Morgan Stanley risk assessors and an S&P ratings representative about inflated mortgage bond ratings.

Jonathan Haidt's Hayek Lecture at Duke argues American universities pursue two potentially incompatible sacred values, truth and social justice. He discusses campus conflict, honor, dignity and victimhood cultures, and viewpoint diversity.

An animated 44-minute summary of Ray Dalio's book Principles for Dealing with the Changing World Order. It lays out the Big Cycle of rising and declining nations, covering debt cycles, internal conflict, and shifts in global power over the past 500 years.

Veritasium explores the Prisoner's Dilemma and Axelrod's tournaments, showing why tit-for-tat and forgiving strategies win in repeated games. It extends the ideas to cooperation in evolution and conflict.

The first part of Innuendo Studios' six-part video essay series on the online hostility around Anita Sarkeesian and GamerGate. It lays out the history and the motivations of the people involved.

Evan Czaplicki, creator of Elm, discusses the hard parts of running an open source project: online community conflict, why its patterns arise, and a cultural history of open source. He offers ideas for more civil, productive communication.

Daniel Azuma's ElixirConf 2018 talk on whether Docker and OTP conflict. He shows they can coexist and uses Horde and DeltaCrdt, with a live tank-game demo, to keep state alive across container kills.

Node.js creator Ryan Dahl discusses ten design mistakes he made in Node, including package.json, npm, and module resolution. The talk sets out the motivations behind his later project, Deno.

A Vox Borders episode with Johnny Harris explaining how China is gradually erasing the line between mainland China and Hong Kong since the 1997 handover. It describes the one country, two systems arrangement and its expiration date.

Robert Erdmann, a materials scientist at the Rijksmuseum, gives a PyCon keynote on the ultra-high-resolution imaging of Rembrandt's Night Watch. He covers the automated gantry camera system, the Python software that drives it, and the large volumes of image data involved.

Bryan Cantrill's Craft 2019 talk on the ethical dilemmas software engineers face as software eats the world. He explores cases where engineering thinking conflicts with the law or personal morals, including Facebook's news feed experiments.

Serpentza, a Westerner living in China, describes Chinese influence efforts abroad and the cultural conflict between Shen Yun and Confucius Institutes. It is a commentary from his personal perspective.

Matt Parker of Stand-up Maths asks whether a country's reported land area accounts for hills and mountains, working through how surface area depends on the resolution of elevation data. It follows up on a question from a viewer and work by researchers who measured it.

James Lambert demos a MegaTexture-style technique running on real Nintendo 64 hardware, built for an N64Brew game jam. It streams high-resolution textures onto stained-glass scenes on the console.

The full 2010 documentary Inside Job, directed by Charles Ferguson, examines the causes of the 2008 global financial crisis. It traces the story through interviews with key financial and political players across several countries.

Not Just Bikes explains how Dutch traffic lights use early detection, transit priority and conflict-free design to cut waiting. The aim is to move as many people as possible rather than as many cars.

Tested gets hands-on with four Meta Reality Labs research VR headset prototypes testing resolution, brightness, focus shifting and form factor, plus an interview with Mark Zuckerberg on display technology.

Stuff Made Here builds a device that lets a blind person perceive their surroundings by touch, using an iPad's lidar and a mechanical tactile display driven by motors. The video walks through the build and the limits he hit.

ASML's short promotional fly-through of its High NA EUV lithography platform, the TWINSCAN EXE, which supports 8-nanometer resolution. It shows the machine's internals including advanced anamorphic optics.

Google engineer Dany Qumsiyeh presents a prototype automatic, non-destructive book scanner that turns pages and captures high-resolution images, built in Google's workshops. The talk includes a live demo and a short technical overview.

A short BicycleDutch episode showing how Dutch protected intersections continue cycle paths through the junction without needing extra street width.

Michael Abrash of Valve explains what affordable VR hardware will be capable of within a couple of years, and describes a prototype showing what that level of hardware can do.

Ben Krasnow of Applied Science uses an antique 4x5 view camera to make high-resolution photolithography masks in a home shop. He photographs a poster-sized printout onto litho film to get features around 20 microns.

CNLohr maps Wi-Fi signal strength at high resolution by moving an ESP8266 on a CNC mill, then visualizes the 3D data in WebGL. The result shows interference patterns in space.

A NASA and Durham University supercomputer simulation suggesting the Moon may have formed within hours of a giant impact between Earth and a Mars-sized body. It is one of the highest-resolution giant-impact simulations run.

A three-minute clip of Noam Chomsky in an exchange with BBC journalist Andrew Marr about media filtering and self-censorship. Chomsky argues that people reach positions precisely because they would not say things that conflict with the system.

A DEFCON 20 panel with NSA whistleblower William Binney, journalist James Bamford and ACLU lawyers on the NSA's mass collection of communications and its conflict with the Constitution.

A travel video of Peru shot natively in 8K HDR at 60fps on a Red Helium sensor. It covers Lima, the Amazon, Cusco and other places.

A one-minute clip from a CSI episode featuring the trope of zooming and enhancing low-resolution images. The uploader says it was the last CSI episode they watched.

A short BicycleDutch episode showing how Dutch junctions with protected cycle paths are laid out. It argues these are proven, non-experimental designs that make intersections safer for cyclists.

SpaceX's official footage of the CRS-6 Falcon 9 first stage landing attempt, in high resolution and slow motion. It shows the descent and touchdown on the drone ship.