Keeping your work safe and tracked

19 terms in this category.

branch
A parallel version of your project where you can try something without touching the version everyone else is using.
checkout
A git command that switches you to a different branch, or to an older version of your files.
clone
Making a copy of a project from GitHub onto your computer.
commit
A saved checkpoint of your work, with a short note explaining what changed.
diff
A view of what changed between two versions — what was added, what was removed.
fork
Your own copy of someone else's project on GitHub, which you can change without affecting the original.
git
A tool that remembers every version of your project, so you can change things without fear of breaking them forever.
GitHub
A website where people store, share, and collaborate on code projects.
gitignore
A file that tells git to pretend certain files don't exist.
issues
The built-in list on a GitHub project where bugs, feature requests, and questions get tracked.
main
also: master (older name)
The default, official branch of a project — the "real" version everyone agrees on.
merge
Combining the changes from one branch into another.
merge conflict
When two branches changed the same bit of code in different ways, and git can't decide which to keep.
pull
Bringing the latest version of a project down from online onto your computer.
pull request
also: PR
A proposal to merge your changes into someone else's project, with a place for them to review and discuss.
push
Sending your saved work from your computer up to a shared place online, usually GitHub.
rebase
Replaying your commits on top of a different starting point, so your branch looks like it was built from the latest version of main.
repo
also: repository
A project folder that git is watching.
stash
A way to temporarily put aside changes you haven't finished, so you can come back to them.