~/talk

Git-ting along with others

Talkat PyData Los Angeles 2019 · 2019-12-03..12-05· [developer-experience]
links:none on file
slides:none on file

A hands-on walkthrough of collaborative Git work shows actual commands and failures: creating branches and forks, pushing a new branch, running git fetch then diagnosing runtime errors from copy/paste, fixing overwritten variables and a missing equals, and resolving merge conflicts with VS Code or SourceTree. The workflow includes opening a pull request, adding reviewers, running tests locally, linking issues to PRs, and using git blame and revert/cherry-pick recipes to recover when merges or commits go wrong.

AI-written summary · about

  1. 0:00Collaborative Git workflows
  2. 1:54Shared Git repository setup
  3. 3:24Merge conflicts resolution
  4. 13:10Branching for teamwork
  5. 16:31Code review importance
  6. 27:43Advanced branching strategies
  7. 33:30Forks vs branches
  8. 37:13Pull requests creation
  9. 41:16Git for data science
  10. 51:59Code review best practices
  11. 1:01:21Live code review demo
  12. 1:12:34GitHub issues tracking
  13. 1:18:54Cleaning branches and history
~/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.