Back to DevOps & Tools Next: IDEs & Editors

Version Control (Git)

Master Git, the essential version control system for tracking changes, collaborating with teams, and managing your code history effectively.

🌳 What is Git?

Git is a distributed version control system that tracks changes in your code over time. It allows multiple developers to work on the same project simultaneously while maintaining a complete history of all changes.

Why Use Git?

• Track every change to your code
• Collaborate safely with team members
• Revert to previous versions easily
• Work on features in isolation (branches)
• Backup your code in multiple locations

Key Benefits:

• Distributed (works offline)
• Fast and lightweight
• Industry standard
• Powerful branching and merging
• Complete project history

Core Git Concepts

Repository

A project folder tracked by Git with complete history

Commits

Snapshots of your code at specific points in time

Branches

Parallel versions of your code for different features

Collaboration

Work with teams using push, pull, and merge operations

Essential Git Commands

🚀 Getting Started

# Configure Git (first time setup)
git config --global user.name "Your Name"
git config --global user.email "your.email@example.com"

# Initialize a new repository
git init

# Clone an existing repository
git clone https://github.com/username/repository.git

# Check repository status
git status

# Add files to staging area
git add filename.txt        # Add specific file
git add .                   # Add all files
git add *.js               # Add all JavaScript files

# Commit changes
git commit -m "Add new feature"
git commit -am "Add and commit in one step"

# View commit history
git log
git log --oneline          # Compact view
git log --graph            # Visual branch representation

Branching and Merging

🌿 Working with Branches

# List branches
git branch                 # Local branches
git branch -r              # Remote branches
git branch -a              # All branches

# Create and switch to new branch
git checkout -b feature-branch
git switch -c feature-branch    # Modern alternative

# Switch between branches
git checkout main
git switch main            # Modern alternative

# Merge branch into current branch
git merge feature-branch

# Delete branch
git branch -d feature-branch    # Safe delete
git branch -D feature-branch    # Force delete

# Push branch to remote
git push origin feature-branch

# Pull latest changes
git pull origin main

Common Git Workflow

📋 Feature Branch Workflow

Create Feature Branch

git checkout -b feature/user-authentication

Make Changes and Commit

git add . && git commit -m "Add login functionality"

Push to Remote

git push origin feature/user-authentication

Create Pull Request

Open PR on GitHub/GitLab for code review

Merge and Clean Up

git checkout main && git pull && git branch -d feature/user-authentication

How to Use Git: Step-by-Step Guide

🚀 Basic Git Workflow

Initialize Repository

git init

Create a new Git repository in your project folder

When to use: Starting a new project or adding Git to existing project

Add Files

git add .

Stage files for commit (prepare them to be saved)

When to use: After making changes you want to save

Commit Changes

git commit -m "message"

Save staged changes with a descriptive message

When to use: When you want to create a checkpoint of your work

Connect to Remote

git remote add origin <url>

Link your local repository to a remote repository

When to use: First time connecting to GitHub/GitLab/etc.

Push Changes

git push origin main

Upload your commits to the remote repository

When to use: When you want to backup or share your changes

Pull Changes

git pull origin main

Download and merge changes from remote repository

When to use: Before starting work or when others have made changes

Git vs GitHub: Understanding the Difference

🤔 Common Confusion Explained

Many beginners confuse Git and GitHub. Here's the key difference: Git is the tool, GitHub is the service.

Aspect	Git	GitHub
What it is	Version control system (software)	Cloud hosting service for Git repositories
Installation	Install on your computer	Access through web browser
Usage	Command line tool for version control	Web interface + Git functionality
Storage	Local repositories on your machine	Remote repositories in the cloud
Collaboration	Basic merging and branching	Pull requests, issues, project management
Cost	Free and open source	Free for public repos, paid for private