~/talk

Git Good with Android Studio

Talkat AndroidMakers by droidcon 2024 · on Friday, 2024-04-26· at 10:30· [developer-experience]
slides:none on file

Demos Android Studio’s built-in Git by showing specific, repeatable actions: path-filtered logs and branch grouping, creating and committing organized changes with change lists, shelving vs git stash, copying/applying patches, enabling the staging area, and heavy history edits via interactive rebase and cherry-pick. Live edits include Kotlin and Compose compiler bumps, adding a main dispatcher, and deleting unused screenshots, then committing, amending, rebasing and preparing pushes so each operation visibly succeeds.

AI-written summary · about

  1. 0:00Git in Android Studio
  2. 1:07Git logs and history
  3. 10:12Branch navigation
  4. 14:25Project changes
  5. 21:53Change lists
  6. 29:01Stashing changes
  7. 35:22Rebase history
  8. 43:08Cherry-pick commits
~/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.