Monday. Your branch is three days behind main and you already know today involves a rebase. Let’s get the vocabulary for it right first.
📖 Word of the Day: Stash
- Word: stash
- IPA: /stæʃ/
- Vietnamese: cất tạm, lưu tạm (những thay đổi chưa commit, để dọn dẹp working directory mà không mất code)
Example sentences:
- “I stashed my changes before switching branches to review the hotfix.”
- “Don’t forget to pop your stash after the rebase finishes — it’s easy to leave code sitting there for days.”
- “Can you stash that work-in-progress code for now? We need a clean tree for the demo.”
Listen and check yourself:
🗂️ Vocabulary Table — Git & Version Control
| Phrase | Vietnamese | Example |
|---|---|---|
| merge conflict | xung đột khi hợp nhất | ”We hit a merge conflict on the config file, nothing serious.” |
| cherry-pick | chọn lọc một commit cụ thể để áp dụng | ”Let’s cherry-pick that fix onto the release branch instead of merging everything.” |
| bisect | tìm kiếm nhị phân để xác định commit gây lỗi | ”I ran a bisect overnight and found the exact commit that broke the build.” |
| blame | xem lịch sử ai đã sửa dòng code đó | ”Run blame on that line before you assume it was Minh’s change.” |
| force push | đẩy code đè lên lịch sử từ xa | ”Never force push to main — you’ll rewrite everyone else’s history.” |
🔊 Pronunciation Guide
Stash breaks into one syllable: /stæʃ/.
- st — a clean, hard “st” like in “stop,” no extra vowel sound between the two consonants.
- æ — the short “a” sound, mouth wide, like in “cat” or “hash.”
- sh — soft, no voice, just air — like telling someone to be quiet.
Say it fast — Vietnamese speakers often add a vowel between “s” and “t” (“sờ-tash”). Don’t. It’s one clean syllable.
Practice sentence (read aloud 3 times):
“I’ll stash this before the standup so we don’t show half-finished code on the shared screen.”
✍️ Exercises
Exercise 1 — Fill in the blank
Choose the correct word: stash, cherry-pick, bisect, blame, force push
- “I don’t want to merge the whole branch — just __________ this one commit.”
- “Someone __________ their way over my changes last night. I had to recover from reflog.”
- “Before you point fingers, run git __________ to see the actual history.”
Show answers
- cherry-pick
- force pushed
- blame
Exercise 2 — Translate to English
- “Tôi cất tạm những thay đổi này trước khi chuyển sang nhánh khác.”
- “Chúng tôi bị xung đột hợp nhất trên file cấu hình.”
- “Đừng bao giờ đẩy đè lên nhánh main.”
Show answers
- “I stashed these changes before switching to another branch.”
- “We hit a merge conflict on the config file.”
- “Never force push to main.”
💬 Idiom of the Day: “Cut corners”
Vietnamese: làm tắt, bỏ qua bước cần thiết để tiết kiệm thời gian hoặc công sức — thường mang nghĩa tiêu cực.
Examples:
- “We cut corners on code review last sprint, and now we’re paying for it in production bugs.”
- “Don’t cut corners on the migration script just because the deadline is tomorrow.”
📺 Recommended Watching
- Fireship — “Git in 100 seconds” — a fast, dense overview if you only have two minutes.
- freeCodeCamp.org — “Git and GitHub for Beginners” — slower pace, good for hearing full sentences around the vocabulary.
- The Net Ninja — “Git & GitHub Tutorial for Beginners” playlist — useful for hearing terms like “stash,” “rebase,” and “cherry-pick” used in context, back to back.
🎯 Daily Challenge
Next time you switch branches mid-task today, say out loud (even just to yourself): “Let me stash this first.” One sentence, but it locks the word in through actual use instead of just reading it.