Glossary
The terms you meet during the pre-work and the workshop, in alphabetical order. Definitions marked (Glosario) are reused or lightly adapted from Glosario, the multilingual glossary for computing and data science terms maintained by The Carpentries, and are used under the CC-BY 4.0 license. Each of those terms links to its Glosario entry, where translations into other languages are available. If you are unsure which tool a term belongs to, see Which tool does what?
- branch (Glosario)
-
A snapshot of a version of a Git repository. Multiple branches can capture multiple versions of the same repository. In the workshop, you create a branch to make changes without touching
mainuntil they are reviewed. - clone (Glosario)
- A copy (usually downloaded) of a Git remote repository on a local computer, or the act of making that copy. In RStudio: New Project > Version Control > Git.
- commit (Glosario)
- As a verb, the act of saving a set of changes to a version control repository. As a noun, the changes saved. Each commit is a labelled snapshot on your project’s history line.
- commit message (Glosario)
- A comment attached to a commit that explains what was done and why.
- default branch (
main) -
The permanent, central branch of a repository, which should contain a working version of the project. New work happens on separate branches and is merged into
mainthrough a pull request. Older projects call this branchmaster. - fork (Glosario)
- A copy of one person’s Git repository that lives in another person’s GitHub account. Changes made in a fork can be offered back to the original repository via a pull request. We mention forks in the workshop but do not use them; our teams collaborate on branches within a shared repository.
- Git (Glosario)
- A version control tool to record and manage changes to a project. Git runs on your own computer.
- GitHub (Glosario)
- A cloud-based platform built around Git that allows you to save versions of your project online and collaborate with other Git users.
- issue (Glosario)
- A bug report, feature request, or other to-do item associated with a project, tracked on the repository’s page on GitHub. Issues can be assigned to people and referenced from commits and pull requests.
- local repository
- The copy of a repository on your own computer, including its full history. You commit here first; pushing sends those commits to the remote repository.
- Markdown (Glosario)
- A markup language with a simple syntax for formatting plain text (headings, links, bold, lists). Markdown is used for README files, for issues and pull requests on GitHub, and for the text portions of Quarto documents.
- merge (Glosario)
- Incorporating the development histories of two branches into one. If both branches changed the same part of a file, a merge conflict occurs. In the workshop, merging happens when a pull request is accepted on GitHub.
- merge conflict (Glosario)
- A situation in which incompatible or overlapping changes have been made on different branches that are now being merged. Git stops, marks the conflicting lines in the file, and asks you to choose what the result should be. A conflict is not an error; it is Git refusing to guess.
- origin
-
The conventional name your local repository uses for its remote repository — a short bookmark, so you don’t have to type the full GitHub address. When you clone from GitHub, Git names that remote
originautomatically. - personal access token (PAT)
-
A long, generated password that proves to GitHub who you are when Git pushes or pulls over HTTPS. You created one in pre-work step 4 and store it with
gitcreds::gitcreds_set(). - pull (Glosario)
- Downloads and synchronizes changes from a remote repository into your local repository. The first step of the commit cycle: Pull, Stage, Commit, Push.
- pull request (Glosario, adapted)
-
A request to merge changes from one branch (or fork) of a repository into another, usually into
main. The reviewer is notified, reads the changes, comments or suggests edits, and eventually merges. Despite the name, it is not the same asgit pull; a pull request lives on GitHub, not in Git. - push (Glosario)
- Uploads and synchronizes changes from your local repository to a remote repository. Until you push, your commits exist only on your computer.
- Quarto
-
An open-source scientific publishing system. A Quarto document (
.qmdfile) combines Markdown text, code, and a YAML header; rendering it produces a finished report, website, or presentation. Quarto is independent of Git and GitHub — it builds documents, not history. - README (Glosario)
-
A plain text file containing important information about a project. On GitHub, the
README.mdof a repository is displayed on its front page. - remote repository (Glosario)
- A repository located on another computer — for us, on GitHub’s servers. Git synchronizes changes between local and remote repositories so that work can be shared.
- render
-
To turn a Quarto source document into its output (for example HTML or PDF), running any code it contains along the way. In RStudio, the Render button runs
quarto render. - repository (Glosario)
- A place where a version control system stores the files that make up a project and the metadata that describes their history. Usually one project, one repository.
- RStudio Git pane
-
The tab in RStudio that shows the state of your repository and offers buttons for the everyday Git actions: Pull, staging checkboxes, Commit, Push, and branch tools. Every button runs a real Git command underneath — clicking Push is
git push. - stage / staging area
-
Selecting which changed files will be included in the next commit, and the waiting room they sit in until you commit. In the RStudio Git pane, ticking the Staged checkbox runs
git addfor that file. - version control (Glosario)
- A system for managing changes made to files during a project’s development, so that any earlier state can be recovered and the reason for every change is recorded. Git is the version control system we use.
- YAML (Glosario)
-
A way to represent nested data using indentation, often used in configuration files. The block between the two
---lines at the top of a Quarto document is its YAML header, holding options such as the title and output format.
Attribution
Definitions marked (Glosario) are from Glosario by The Carpentries, licensed under CC-BY 4.0; some have been shortened or adapted to the context of this workshop. The remaining definitions were written for this course.