Git & Version Control
Merge
What It Is
Combining changes from one branch into another
Analogy
Taking the edits from your draft and incorporating them into the published version
Try It Out
Merge Workflow
feature/new-header
main
Merging changes from feature/new-header into main
Related Terms in Git & Version Control
Git
Track Changes in Microsoft Word, but for your entire project, and you control when to save checkpoints
GitHub
Google Drive for code — your files exist locally, but GitHub is where you back them up and share them
Repository (Repo)
A folder with a detailed diary of every change ever made to it
Commit
A save point in a video game — you can always go back to it if things go wrong