Git and GitHub
Git records the history of a project and GitHub is the place most teams share it. A few core terms cover nearly everything you will do day to day.
Not yet reviewedLevel
Resources
Terms
- BeginnerGitGit is a version control system that records the history of your files, so you can go back, compare and work in parallel.Not yet reviewed
- BeginnerRepositoryA repository, or repo, is a project folder tracked by Git, together with its full history.Not yet reviewed
- BeginnerGitHubGitHub is a website that hosts Git repositories and adds collaboration features such as pull requests and issues.Not yet reviewed
- BeginnerCommitA commit is a saved snapshot of your changes with a short message describing them.Not yet reviewed
- BeginnerBranchA branch is a separate line of work inside a repository, so you can build a feature without touching the main version.Not yet reviewed
- BeginnerPull requestA pull request proposes merging one branch into another and gives teammates a place to review and discuss the changes.Not yet reviewed
- IntermediateMerge conflictA merge conflict happens when two branches changed the same lines and Git cannot decide which to keep.Not yet reviewed
Documentation
What is GitHub?
A short orientation on what GitHub is and how it relates to Git.
Books
Pro Git
A free book that covers Git from first commands to branching and workflows.
Know more about Git and GitHub?
Suggest a term, a change, or a resource. No account needed.
Suggest a change