🔀Version Control
Git, GitHub and tracking changes · 45 terms
Git Basics
14Saving changes with Git, from the first folder to the first commit.
A way to save each change to your files, so you can go back to any.
The most used tool for saving each change to code. It helps teams share it too.
A project folder. It also keeps a full record of each change ever made.
One repo that holds the code for many projects. They all share one history.
The project files you see and change right now. Git has not saved them yet.
The place where you pick which changes go into your next commit.
A saved snapshot of your project, with a note saying what changed.
The note saved with a commit. It says what changed and why.
The ID of one commit. It is a long code of letters and numbers.
A list of the lines that changed from one version of a file to the next.
A command that shows which files changed, which are staged and which are new.
A command that lists past commits, newest first. It shows who made each one.
A file that tells Git what to leave out, like keys and build files.
A script Git runs on its own, like a check just before each commit.
Branches and History
12Working on separate lines, joining them back and moving through the past.
A line of work to one side. Try changes there while main stays safe.
The home branch of a repository. Work starts from it and merges back into it.
A short branch for one piece of work, merged back when it is done.
Git's mark for where you are now: your branch and your commit.
Joining work from one branch into another. Both sets of changes end up in one place.
Two branches changed the same lines, so Git asks you to choose what stays.
A merge where Git just slides the branch forward. No merge commit is made.
Merging a branch as one commit. Main's history stays short.
Your commits move to start from a newer point. The past reads as one line.
One saved change, picked from a branch and added to yours.
A fixed name on one commit. It often marks a release, like v1.0.
Put your changes to one side for now. Then bring them back when you are ready.
Undo Commands
3Taking back a commit, by adding a new one or by moving the branch.
A new commit that undoes an old one. The old one stays in the history.
Moving a branch back to an earlier commit. Later commits drop out of it.
Fixing your last commit before you share it. You can change its message or its files.
Team Workflows
3Rules a team agrees on for branches: how long they live and where they merge.
A team's rules for which branches to make and how work merges back.
Everyone merges small changes into one main branch. They do it at least once a day.
A way to use branches. It has main, develop, feature, release and hotfix branches.
Remotes
5Sending work to a shared copy of the repo and bringing others' work back.
A shared copy of a repo on a server. The team swaps its work there.
Your own full copy of a repo, with all of its past.
Sending your new commits up to the shared remote. Then the team can get them.
Getting the new commits from the remote. Your own files stay just as they were.
The team's new commits come down from the remote into your branch.
Collaboration
8How teams host code online, offer changes and read each other's work.
A site that keeps Git repos online. Teams share and check code there.
GitHub's list of bugs, ideas and tasks, kept beside the code.
A place to host Git code. Merge requests and test runs are built in.
A place to host Git code, made by Atlassian. It links closely to Jira.
Your own copy of someone else's repo, on the site. You are free to change it.
A request to merge a branch, with a page where the team reviews the changes.
Rules that keep changes off a branch until reviews and tests pass.
Your team reads your changes before they go in. They catch bugs and share ideas.