Git for Beginners: The Complete Guide (2026)

Git is the version control system used by 95%+ of development teams. If you want to work as a developer, you must know Git. This guide covers everything you need from zero to productive in Git.

What Is Git?

Git tracks changes to your code over time, allowing you to:

• Undo mistakes by reverting to previous versions
• Work with teammates without overwriting each other's code
• Maintain different versions (branches) of your codebase simultaneously
• Review the history of every change ever made

Setting Up Git

After installing Git, configure your identity:

git config --global user.name "Your Name"
git config --global user.email "you@email.com"

Essential Git Commands

Starting a Repository

# Create a new repo
git init

# Clone an existing repo
git clone https://github.com/user/repo.git

The Basic Workflow

# Check what changed
git status

# Stage files for commit
git add filename.js       # Stage one file
git add .                 # Stage all changes

# Commit with a message
git commit -m "Add login form validation"

# Push to remote
git push origin main

Branching

# Create and switch to a new branch
git checkout -b feature/login-page

# Switch branches
git checkout main

# List all branches
git branch

# Delete a branch
git branch -d feature/login-page

Merging & Pull Requests

# Merge a branch into your current branch
git merge feature/login-page

# Pull latest changes from remote
git pull origin main

The Git Workflow for Teams

1. Pull the latest main branch: git pull origin main
2. Create a feature branch: git checkout -b feature/new-thing
3. Make your changes and commit frequently
4. Push your branch: git push origin feature/new-thing
5. Open a Pull Request on GitHub
6. Get code review and address feedback
7. Merge the PR and delete the branch

Writing Good Commit Messages

Good commit messages make your code history readable:

• Good: "Add email validation to registration form"
• Good: "Fix crash when user uploads empty file"
• Bad: "fix bug"
• Bad: "WIP"
• Bad: "asdfasdf"

Use the imperative mood: "Add feature" not "Added feature" or "Adding feature."

Common Mistakes and How to Fix Them

Committed to the wrong branch

# Undo last commit but keep changes
git reset --soft HEAD~1
# Switch to correct branch and recommit
git checkout correct-branch
git add . && git commit -m "Your message"

Need to undo a commit

# Undo last commit, keep changes staged
git reset --soft HEAD~1

# Undo last commit, unstage changes
git reset HEAD~1

# Completely discard last commit and changes
git reset --hard HEAD~1

Merge conflicts

When Git can't auto-merge, it marks conflicts in the file. Open the file, resolve conflicts manually, then:

git add resolved-file.js
git commit -m "Resolve merge conflict in resolved-file.js"

Git Tools to Know

• GitHub Desktop — Visual Git client for beginners
• VS Code Git integration — Built-in Git support with diff viewer
• GitLens — VS Code extension that shows blame, history, and insights
• lazygit — Terminal-based Git UI for power users