~/talk

Git in Control, Version Control and How it Could save Your Life

Talkat DjangoCon US 2016 · 2016-07-17..07-22· [developer-experience]
slides:none on file

Concrete, runnable rescue steps and real command names replace handwaving: walkthrough of repository setup (git init, remote add origin, clone), typical workflow (git add, commit -m, push origin master), branching and merging, and the difference between fetch+merge versus git pull. Demonstrations include stash maneuvers to move work between branches (git stash, git stash pop, git stash branch), undoing mistakes with git reset --hard and rm plus .gitignore, editing commits with git commit --amend, and the fork → clone → push → pull request cycle; Git’s origin story: Linus Torvalds built it in a weekend.

AI-written summary · about

  1. 0:00Intro
  2. 0:45Outline
  3. 1:15Who am I
  4. 2:29Version Control
  5. 4:05Git Setup
  6. 12:55Branch
  7. 13:37Fetch
  8. 14:39Conflicts
  9. 18:10Tricky Stuff
  10. 19:50Git Stash
  11. 22:01Removing Files
  12. 24:01Git Tips
~/search
type to search 6,249 conferences, 138,987 speakers and 185,172 talks
~/help
cmdctrl k
search every conference, speaker and series
/
focus the filter search
h
home
c
conferences
s
speakers
e
series
t
light / dark — the status bar button does the same
?
this help
esc
close this, then clear every filter — or just the search, while you are typing in it

Ignored while you are typing. Pages without a filter rail have no search to focus.