"Please Let Me Merge Before I Start Crying": And Other Things I've Said at The Git Terminal
summary
Shows a concrete two-branch example where a shared config file has conflicting dates and explains the three conflict markers you actually edit to resolve it, not magic merging. Demonstrates commands and tools: git merge --abort to back out, git status to find unmerged files, RStudio’s Git pane (look for the orange U) and GitHub Desktop’s abort button. Argues conflicts are mostly communication and workflow issues and gives specific habits: commit often, push thoughtfully, stash unfinished work, and pull to avoid branch drift.
AI-written summary · about
chapters (19)
- 0:00Git collaboration struggles
- 2:29Git versus GitHub
- 3:13Git merge fundamentals
- 4:19Merge conflicts intimidation
- 5:03Merge conflict types
- 6:06Real merge conflict example
- 7:34Three conflict components
- 8:17Safely abort a merge
- 9:21Assess merge damage
- 10:24Choosing your own adventure in conflicts
- 11:31Resolve conflicts manually
- 12:38Conflicts as workflow issues
- 13:18Communication reduces conflicts
- 14:23Leverage developer platforms
- 14:45Workflow before coding
- 15:48Workflow during coding
- 16:31Workflow after coding
- 17:13Improve Git knowledge
- 17:56Practice for confidence
