Subject
10 entries
Version Control
Bookmarks
Jujutsu For Busy Devs: Practical Intro to jj
A pragmatic intro to Jujutsu (jj), the new version control system that's git-compatible but fixes many of git's ergonomic frustrations — written for developers who don't have time for a deep-dive. jj's working-copy-as-a-commit model and first-class conflict handling make it worth adopting.
Git Organized: A Better Git Flow
A simple git workflow improvement: make changes freely on a branch with WIP commits, then git reset to the branch point and recommit in logically grouped chunks before opening a PR. Separates the messy work of development from the clean artifact of a review-ready commit history.
Git Pretty — Recovery Flowchart
Justin Hileman's flowchart for deciding which git command to run when you're in a mess — a decision tree that starts with 'did you push?' and branches into the right cleanup command. The most-shared git recovery reference of its era.
git-flight-rules
A comprehensive guide by k88hudson covering what to do when things go wrong in git — structured as flight rules (NASA-style: if X happens, do Y). One of the most-starred git reference repos on GitHub.
Why is
Stack Overflow thread on why git pull creates problems in divergent branches — advocates for git pull --rebase or a fast-forward-only alias instead. A workflow habit that eliminates unnecessary merge commits from shared history.
Git Tips from the Trenches
A practitioner's collection of git tips beyond the basics — covering aliases, bisect, stash, reflog, and workflow patterns learned from actual team use. The kind of git knowledge that only comes from running into the same problems repeatedly.
On Undoing, Fixing, or Removing Commits in Git
Seth Robertson's choose-your-own-adventure guide to undoing git mistakes — a decision tree covering uncommitted changes, unpublished commits, and pushed history. The go-to reference when something has gone wrong in git.
Learn Git Branching
Learn Git Branching is an interactive visual tutorial for Git concepts — especially branching, merging, rebasing, and remotes. The best resource for building a mental model of how Git's DAG actually works.
Git Data Mining with Hadoop
WANdisco's post on mining git repository data at scale using Hadoop — applying distributed batch processing to version control history to extract patterns across large codebases. An early example of treating code evolution as a data science problem.
Git (and Github) for Data
Open Knowledge Foundation's 2013 post on using Git and GitHub for data versioning — exploring whether the version control model that worked for code could work for datasets. An early articulation of what became the data-as-code movement.