The Ultimate Guide Git & GitHub (Beginner To Advanced) 2025

Git is a distributed version control system created by Linus Torvalds in 2005. It allows multiple developers to work on a project without overwriting each other’s work by tracking changes, enabling branching, merging, and maintaining a complete project history.

GitHub is a web-based platform that uses Git for version control. It provides a user-friendly interface for sharing code, managing projects, and collaborating with developers around the globe. GitHub also offers features like pull requests, issues, actions, and integrated CI/CD tools, making it ideal for open-source and enterprise development.

Keywords:

Git
GitHub
Version control
Git basics
GitHub for developers

Why Use Git and GitHub?

Track Changes: Keep a history of changes in your codebase.
Collaboration: Work with others using pull requests and issues.
Backup: Cloud-based storage of your project.
Project Management: Manage tasks, bugs, and features using GitHub issues and projects.

Installing Git

Windows:

Download the installer from https://git-scm.com
Run the setup and follow the wizard to install Git with default settings.
Verify installation:

# Checks the installed Git version
git --version

macOS:

# Installs Git using Homebrew
brew install git

Linux:

# Installs Git on Debian/Ubuntu
sudo apt install git

# Installs Git on RedHat/CentOS
sudo yum install git

Git Basics

Configuring Git

# Sets your Git username
git config --global user.name "Your Name"

# Sets your Git email address
git config --global user.email "you@example.com"

Initialize Repository

# Initializes a new Git repository in your current directory
git init

Clone Repository

# Creates a copy of an existing GitHub repository locally
git clone https://github.com/username/repo.git

Check Status

# Displays the status of your working directory and staging area
git status

Stage and Commit

# Stages all changes in the current directory
git add .

# Commits staged changes with a message
git commit -m "Initial commit"

Git Commands with Examples

Command	Description
`git init`	Create a new repository
`git clone`	Copy a remote repository to your local machine
`git status`	Display the state of the working directory
`git add`	Stage files to be committed
`git commit`	Commit staged changes
`git log`	View commit history
`git diff`	Show differences between commits and working directory
`git reset`	Undo commits or reset files in the index
`git rm`	Remove files from the working directory and staging area
`git mv`	Move or rename a file

Example:

# Creates a new file with content
echo "Hello World" > hello.txt

# Adds the file to the staging area
git add hello.txt

# Commits the file to the repository
git commit -m "Added hello.txt"

Branching and Merging

Create Branch

# Creates a new branch named 'feature1'
git branch feature1

Switch Branch

# Switches to the branch named 'feature1'
git checkout feature1

Merge Branch

# Switches back to the main branch
git checkout main

# Merges changes from 'feature1' into 'main'
git merge feature1

Delete Branch

# Deletes the branch named 'feature1'
git branch -d feature1

Working with GitHub

Creating a Repository

Go to GitHub
Click on New Repository
Name it and initialize with README (optional)

Push to GitHub

# Links your local repository to the remote GitHub repo
git remote add origin https://github.com/username/repo.git

# Pushes your code to the main branch on GitHub
git push -u origin main

Pull Changes

# Pulls updates from the main branch of the remote repo
git pull origin main

Forking a Repository

Go to the repository page on GitHub
Click on Fork to create a copy under your account

Collaborating on GitHub Projects

Create a Pull Request

Push changes to a feature branch
Go to GitHub > Pull Requests > New Pull Request

Code Review

Reviewers can comment on code lines
Request changes or approve the PR

Merge Pull Request

Review the changes
Click Merge to integrate the feature branch into the main branch

Git vs GitHub: Key Differences

Feature	Git	GitHub
Type	Version Control Tool	Hosting Platform for Git Projects
Interface	Command Line	Web Interface
Hosting	Local Machine	Remote (Cloud)
Collaboration	Manual (via patches, branches)	Built-in features for teams (pull requests, issues)

Best Practices

Use .gitignore to exclude sensitive or unnecessary files
Commit small and logical changes frequently
Write clear, meaningful commit messages
Always create feature branches instead of working directly on main
Pull the latest changes before pushing your code
Perform code reviews before merging PRs

Common Issues and Troubleshooting

Merge Conflicts

# Shows conflicted files
git status

# Stages resolved conflict files
git add conflicted_file.txt

# Commits the merge resolution
git commit

Detached HEAD

# Switches back to a branch to fix detached HEAD state
git checkout main

Push Rejected (Non-Fast-Forward)

# Re-applies local commits after pulling remote changes
git pull --rebase

Advanced Git Techniques

Stashing Changes

# Temporarily saves changes not ready to commit
git stash

Rebase

# Re-applies commits from the current branch onto another branch
git rebase main

Amend Commit

# Modifies the last commit (e.g., to fix the message)
git commit --amend

Cherry-pick

# Applies a specific commit from another branch to your current branch
git cherry-pick <commit-hash>

Tagging

# Tags the current commit as version 1.0
git tag v1.0

# Pushes the tag to the remote repository
git push origin v1.0

Hooks

# Git hooks are custom scripts triggered by Git events. For example:
.git/hooks/pre-commit

Git and GitHub are essential tools in modern software development. From version control and backups to collaboration and CI/CD, mastering these tools boosts your productivity and code quality. Start small, experiment, and explore advanced features to become a Git power user.

Don’t forget to bookmark this guide and share it with your team!