Glossary
Quick-reference definitions of every Git term used in this guide, sorted alphabetically. Click any term to jump to the page where it is explained in detail.
If a term is not listed here, it is probably not something you need
to worry about day-to-day. This glossary covers the vocabulary
non-technical team members are most likely to encounter.
| Term | Definition | Learn more |
|---|---|---|
| Branch | A separate line of development. Like making a photocopy of a document to try edits on, keeping the original safe. | Branches |
| Checkout | Switching your workspace to show a different branch. Like opening a different document on your desk. | Branches |
| CI / CD | Continuous Integration / Continuous Deployment. Automated systems that test code and deploy it. Think of it as a robot assistant that checks every PR for errors. | Pull Requests |
| Clone | Downloading a copy of a remote repository to your computer. Like downloading a shared folder from the cloud. | Git Basics |
| Commit | A save point that captures the exact state of every file. Like pressing "Save" in a video game. Each commit has a short message describing what changed. | Git Basics |
| Conflict | See Merge Conflict. | Branches |
| Develop branch | The integration branch where finished features are collected before release. Like an editor's draft combining all approved chapter rewrites. | Branches |
| Diff | A comparison showing exactly what changed between two versions of a file. Lines added are shown in green, lines removed in red. | Pull Requests |
| Feature branch | A temporary branch created for developing a specific feature. Named like feature/dark-mode. Deleted after merging. |
Branches |
| Git | A version control system that tracks every change ever made to a project. Like "Save As" with a time machine. | Git Basics |
| GitHub | A website where teams store their Git repositories online. Like a cloud storage service specifically for code projects, with built-in review and discussion tools. | Git Basics |
| .gitignore | A file that tells Git which files to ignore (not track). Used for temporary files, secrets, and build outputs that should not be shared. | Git Basics |
| Main branch | The production version of the project — what is live and running. Only thoroughly reviewed work goes here. | Branches |
| Merge | Combining changes from one branch into another. Like accepting an edited chapter back into the main manuscript. | Pull Requests |
| Merge conflict | When two branches changed the same part of a file and Git cannot decide which version to keep. Requires a human decision. Normal and not dangerous. | Branches |
| PR | See Pull Request. | Pull Requests |
| Pull | Downloading the latest changes from GitHub to your computer. Like refreshing a shared document to see everyone's updates. | Git Basics |
| Pull Request | A formal request to merge your branch into another branch. Includes your changes, a description, and a discussion thread for review. Like submitting a draft for approval before publishing. | Pull Requests |
| Push | Uploading your commits from your computer to GitHub. Like saving your local copy back to the cloud. | Git Basics |
| Remote | The online copy of your repository, usually on GitHub. Your local repository talks to the remote to sync changes. | Git Basics |
| Repository (repo) | Your project folder with a hidden diary that records every change. The home of all your code and its history. | Git Basics |
| Review | The process of examining a PR's changes before approving them. Reviewers check for correctness, safety, and quality. | Pull Requests |
| Squash | Combining multiple commits into one before merging. Keeps the history clean and simple. | Pull Requests |
| Stash | Temporarily saving uncommitted work without creating a commit. Like putting your papers in a drawer while you handle something else, then taking them back out. | Cheat Sheet |
| Tag | A label attached to a specific commit, usually marking a release version (e.g., v1.0.0). Like putting a bookmark in a book. |
Workflow |
| Version control | A system that tracks changes to files over time, allowing you to recall any previous version. Git is the most popular version control system. | Git Basics |
| Worktree | A separate folder linked to the same repository but showing a different branch. Like having multiple desks, each with a different document open. Allows parallel work without switching branches. | Worktrees |
| .worktrees/ | The BACON-AI convention for storing worktree folders inside a project. This folder is not tracked by Git (it is in .gitignore). |
Worktrees |