git merge

Greg Kroah-Hartman's Git Merge 2016 talk on how the Linux kernel is developed, how fast it moves, and how git and email workflows keep it manageable. He is the stable kernel maintainer.

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.

Scott Chacon's FOSDEM 2024 talk on lesser-known Git tips and tricks: useful config settings, older and newer commands, monorepo and big-repo features, and recent GitHub additions. It closes with why he is now building GitButler, followed by a Q&A.

GitHub interviews Linus Torvalds on twenty years of Git, from its creation in about ten days as a Linux kernel tool to its role in modern software development. He discusses technical decisions, community contributions and the project's philosophy.

A lecture from MIT's Missing Semester course covering version control with git. It builds up git from its data model rather than from commands.

A Linux.conf.au 2013 talk that explains git's internal model using a playful, toy-based approach. It presents git operations as operations on a graph of commits, aimed at people who find git confusing.

A three-minute Emacs Rocks screencast demonstrating Magit, the Git interface inside Emacs, including staging and other everyday operations.

Scott Chacon introduces Git by showing what happens under the hood for basic commands: staging, committing, data storage, branching, merging and pushing. He contrasts it with Subversion and shows history viewing with log.

A fasterthanlime video essay arguing that GitHub Actions is a poorly designed system, with a history of personal computing and CI, and a look at how it works behind the scenes. It is sponsored by Brilliant.

The author of lazygit demos 15 features of his terminal UI for git, such as staging individual lines and easier rebasing, aimed at making common git tasks simpler.

A short parody clip in the 'Hitler learns about...' meme format, in which Hitler rants about git's confusing commands. It riffs on git's complexity and the Linus Torvalds and Facebook angle.

Researchers from the Artificial Life Lab Graz introduce the Primordial Particle System, where a simple motion law for self-propelled particles produces cell-like structures that self-reproduce and show life cycles.

Corridor Digital's comedic fake video of a Boston Dynamics robot fighting back against its human tormentors, made with motion capture and VFX.

Monty Montgomery of Xiph.org gives real-time demonstrations of sampling, quantization, bit depth and dither using real audio equipment, including both digital analysis tools and vintage analog bench gear. It shows that sampled audio is not stair-stepped and corrects common misconceptions about digital audio.

Linus Torvalds gives a Google tech talk on git, the source control system he created two years earlier. He argues for distributed version control over centralized systems such as CVS and Subversion.

The first lecture in an 18-part series on digital photography from Marc Levoy's Stanford CS 178 course, recorded at Google in 2016. The series covers how digital cameras work and computational photography, with slides and assignments available on the course site.

Big Clive tears down a cheap eBay digital caliper, explaining its capacitive linear encoder and measuring its quiescent current. He finds it surprisingly accurate and repeatable for its price.

A one-minute Volvo Trucks demo of the Collision Warning with Emergency Brake system on a fully loaded 40-ton tractor-trailer, avoiding a rear-end collision on a test track.

Bill Hammack of engineerguy uses slow motion video to show how the IBM Selectric typewriter works. He focuses on its fully mechanical digital-to-analog converter, which turns key presses into rotation of the type ball.

Curt Jaimungal interviews biologist Michael Levin of Tufts about consciousness, bioelectricity, emergence, and cancer research. The conversation challenges reductionist views of life.

Cockpit footage of a Swiss Airbus A340 crew dealing with rising oil temperature in one engine on a Zurich to Shanghai flight, ending with a safety landing. It shows the pilots' procedures through the emergency.

SQLite author Richard Hipp's talk at SouthEast LinuxFest criticizing Git's workflow and introducing Fossil as an alternative. He lists Git enhancements and argues for keeping history intact.

A roughly 3.7-hour Lex Fridman podcast with Pieter Levels, the solo developer behind over 40 startups. They discuss programming, viral AI products, indie hacking and digital nomad life.

Jesse Newland describes how GitHub uses Hubot, its chat bot, to run operations such as deployment, monitoring, graphing and provisioning from chat rooms. He explains how this improves shared awareness and remote work culture.

A short demo shows how to use the Tesla Model 3's mechanical emergency door release on the front doors as a backup to the electronic release. It notes an on-screen warning that frequent use could damage the door seals.

A DevOps YouTuber tests GitHub Copilot on a range of Leetcode problems and finds it solves most immediately, with a few needing tweaks and some far off. He concludes it would outperform him in a FAANG-style interview.

Air traffic audio of a pilot slurring and incoherent while declaring an emergency due to extreme hypoxia, with controllers at Cleveland Center struggling to understand him.

Unity's real-time cinematic teaser 'Enemies' from its Demo Team, showcasing HDRP lighting, strand-based hair and an advanced digital human toolkit. It is a short showcase of high-end real-time rendering.

A short project video in which Greg Raiz turns a 32-inch eInk display into a wireless digital newspaper showing daily front pages. It runs for months on battery, and the code is published on GitHub.

A 146-minute Merged Podcast episode in which UAP researcher Ryan Graves talks with economist Robin Hanson about UFOs. Topics include the Great Filter, Hanson's grabby aliens model, and the push for more inquiry into UAPs.

Max Brunsfeld of GitHub presents Tree-sitter, a parsing system for programming tools that supports incremental, error-tolerant parsing. He demos its integration into GitHub.com and Atom for syntax highlighting and code navigation.

A Corridor Digital parody of a Boston Dynamics promo, showing a CGI military robot trained for combat that goes rogue and refuses to kill a robotic dog.

Part 2 of a Q&A workshop with security researcher Jacob Appelbaum from April 2012, covering mobile phone security, cellphone forensics, state repression and surveillance. Topics include booting Tails from USB and surveillance self-defense resources.

Cirrus introduces Safe Return, an emergency autoland system for its Vision Jet. A passenger presses a single button and the aircraft squawks emergency, reroutes and lands itself.

A one-minute visualization of a simulated ant colony in which ants follow pheromone trails, with the source code on GitHub. It shows emergent behavior arising from simple rules.

AVweb's flight trial of Garmin's Emergency Autoland system, which flies a plane to a runway and lands it when the pilot cannot. It is part of Garmin's Autonomi automation on the G3000 avionics.

A local news report about a woman who ordered a pizza on a 911 call to discreetly signal domestic violence and give her address to the dispatcher. The coverage includes the actual dispatcher call.

Corridor Digital makes a roughly seven-minute anime short using Stable Diffusion and related AI tools, based on a technique they teach in a longer tutorial. It was an early showcase of AI-assisted animation.

Episode 2 of Corridor Digital's Anime Rock, Paper, Scissors, a short film made with AI-assisted animation techniques such as Stable Diffusion and DreamBooth. The story follows King Philip facing his twin brother and a barbarian king.

A clip from the 2011 film Margin Call in which senior partners hold an emergency meeting and decide to sell off toxic assets immediately. It is set at the start of the 2008 financial crisis.