Complete Git and GitHub Tutorial for Beginners
All Notes
02 July 2025
Notes on Git and GitHub Tutorial
Overview
This tutorial provides a comprehensive introduction to Git and GitHub, focusing on their functionalities, commands, and practical applications for developers. It covers the basics of version control, the importance of Git in project management, and how to effectively use GitHub for collaboration and code storage.
1. Introduction to Git
- Definition: Git is a version control system that helps track changes in code.
- Importance: Essential for developers to manage both small and large projects.
- Analogy: Similar to a bank account statement that tracks all transactions (changes in code).
Key Features of Git
- Version Tracking: Keeps a history of changes, including additions, deletions, and modifications.
- Collaboration: Facilitates teamwork by allowing multiple developers to work on the same project without overwriting each other's changes.
- Free and Open Source: Accessible to everyone without any cost.
2. Understanding GitHub
- Definition: GitHub is a web-based platform that allows developers to store and manage their code using Git.
- Repositories: Projects are stored in repositories (repos), which can be public or private.
- Profile Creation: Users can create profiles on GitHub to showcase their projects.
Key Functions of GitHub
- Code Storage: Developers can upload their code and manage it through GitHub.
- Portfolio: Useful for job applications, as candidates can share their GitHub links to demonstrate their work.
3. Basic Git Commands
3.1 Initial Setup
- Configuration: Set up user name and email for Git.
- Command:
git config --global user.name "Your Name" - Command:
git config --global user.email "your_email@example.com"
- Command:
3.2 Common Commands
- Clone: Create a local copy of a remote repository.
- Command:
git clone <repository-url>
- Command:
- Status: Check the status of files in the working directory.
- Command:
git status
- Command:
- Add: Stage changes for commit.
- Command:
git add <file-name>orgit add .(to add all changes)
- Command:
- Commit: Save changes to the local repository.
- Command:
git commit -m "commit message"
- Command:
- Push: Upload local changes to the remote repository.
- Command:
git push origin <branch-name>
- Command:
- Pull: Fetch and merge changes from the remote repository.
- Command:
git pull origin <branch-name>
- Command:
4. Branching in Git
- Definition: Branches allow multiple lines of development within a project.
- Creating a Branch:
- Command:
git checkout -b <branch-name>
- Command:
- Switching Branches:
- Command:
git checkout <branch-name>
- Command:
- Merging Branches: Combine changes from one branch into another.
- Command:
git merge <branch-name>
- Command:
Handling Merge Conflicts
- Definition: Occurs when changes in different branches conflict.
- Resolution: Manually edit the conflicting files and commit the resolved changes.
5. Forking and Pull Requests
- Forking: Creating a personal copy of someone else's repository.
- Pull Request: A request to merge changes from a forked repository back into the original repository.
Steps to Create a Pull Request
- Make changes in the forked repository.
- Push changes to the forked repository.
- Navigate to the original repository and create a pull request.
6. Undoing Changes
- Resetting Changes:
- Command:
git reset <file-name>(to unstage changes) - Command:
git reset --hard(to discard all changes)
- Command:
- Reverting Commits:
- Command:
git revert <commit-hash>(to create a new commit that undoes changes)
- Command:
7. Visual Representation of Key Concepts
| Concept | Description |
|---|---|
| Git | Version control system for tracking changes in code. |
| GitHub | Web platform for hosting Git repositories and collaboration. |
| Repository | A storage space for your project, can be public or private. |
| Branch | A separate line of development in a project. |
| Merge | Combining changes from different branches. |
| Fork | Creating a personal copy of a repository to make changes independently. |
| Pull Request | Request to merge changes from a forked repository into the original. |
Conclusion
Understanding Git and GitHub is crucial for modern software development. Mastery of these tools enhances collaboration, version control, and project management skills, making developers more effective in their work.