5 min read8 hours ago

–

Press enter or click to view image in full size

Git , Github , Bookcover

Whether you’re prepping for a tech interview or finally deciding to understand what that mysterious “.git” folder actually does — this guide is your one-stop roadmap.

I’ve compiled the most practical, interview-tested Q&A on Git and GitHub — packed with real insights, “pro tips,” and examples you can actually use.

Let’s dive in 👇

🧩 Section 1: The Basics

❓ Q1. What is Git?

Git is a distributed version control system (DVCS) — it tracks your code history, helps teams collaborate, lets you roll back to older versions, and supports branching/merging.

💡 Pro Tip: Always mention the word distributed in interviews — it shows you understand Git works even offline.

❓ Q2. What is GitHub?

GitHub is a cloud platform built around Git. It hosts repositories, enables collaboration through Pull Requests, Issues, Actions (CI/CD), and project boards.

💡 Pro Tip: Remember this formula →

Git = tool* 🧰 GitHub = platform ☁️*

⚡ Common Git Commands You Should Know

git init                 → Initialize a new Git repository  git clone <url>          → Copy a repo from remote to local  git status               → Show modified/untracked files  git add .                → Stage all changes  git commit -m "msg"      → Save a snapshot with a message  git log --oneline        → Compact commit history  git branch               → List branches  git checkout -b <branch> → Create + switch branch  git merge <branch>       → Merge branch into current  git push origin main     → Push local commits to GitHub  git pull                 → Fetch + merge changes from remote  git fetch                → Only download changes (no merge)

💡 Pro Tip: Mention git commit -am "msg" — it’s a cool shortcut for tracked files.

❓ Q3. Git vs. GitHub — What’s the Difference?

Feature Git GitHub Type Local tool Cloud service Purpose Version control Collaboration & hosting Internet needed? No Yes Alternatives GitLab, Bitbucket GitLab, Bitbucket Cloud

🎯 Interview Edge: Drop “GitLab” or “Bitbucket” in your answer — it shows awareness of the ecosystem.

❓ Q4. What’s a Repository?

A repository is your project folder managed by Git — containing code, commits, and branches.

• Local repo: on your computer (git init)
• Remote repo: hosted on GitHub for collaboration

💡 Pro Tip: Always clarify the difference between local and remote — interviewers love that.

❓ Q5. What is a Commit?

A commit is like a save point — a snapshot of your code with author info, timestamp, and a unique hash.

💡 Pro Tip: Commit messages tell the story of your project. Keep them clear and meaningful.

🌿 Section 2: Branching & Merging

❓ Q6. What is a Branch?

A branch lets you work on new features without breaking the main codebase.

💡 Pro Tip: Talk about how “feature branches” prevent production issues — recruiters love hearing that.

❓ Q7. Merge Conflicts — The Developer’s Nightmare 😅

A merge conflict happens when two branches change the same lines of code. Git can’t decide whose change to keep.

🪄 How to fix it:

1. Open the file and check conflict markers (<<<<<<<, =======, >>>>>>>).
2. Decide which code to keep (or merge manually).
3. Save → git add → git commit.

💡 Pro Tip: Handling conflicts gracefully is a teamwork skill, not just a Git trick.

❓ Q8. Merge vs. Rebase

Merge Rebase Keeps full history (non-linear) Makes linear history Easier for teams Great for personal branches Creates merge commit Rewrites history

💡 Pro Tip: Use merge in teams, rebase for your own cleanup.

❓ Q9. What’s a Fast-Forward Merge?

When no new commits exist on the target branch, Git just moves the branch pointer ahead — clean and simple.

💡 Pro Tip: Fast-forward merges keep history clean but hide branch activity.

🧠 Section 3: Staging & Workflow

Git’s workflow happens in three zones:

Working Directory → Staging Area → Repository

❓ Q10. What does git add do?

It stages changes — preparing them for commit.

❓ Q11. Do you always need git add . before committing?

Nope. For tracked files, you can go straight with:

git commit -am "message"

But for new/untracked files, git add is mandatory.

❓ Q12. What’s git stash?

Temporarily saves uncommitted work. Perfect for:

“I’m halfway through a feature and need to fix a bug on *main*.”

Commands:

git stashgit checkout main# fix the buggit stash pop

💡 Pro Tip: Mention this — it shows you understand real-world context switching.

❓ Q13. .gitignore — The Silent Hero

Lists files/folders Git should ignore — like node_modules, venv, .env, or logs. Clean repos = happy teams.

❓ Q14. Reset vs. Revert vs. Checkout

Command What It Does Safe for Teams? reset Moves HEAD (can delete commits) ⚠️ No revert Creates a new commit that undoes changes ✅ Yes checkout Switch branches or restore files ✅ Yes

💡 Pro Tip: Say “I prefer revert — it preserves history.” That line alone impresses interviewers.

🌍 Section 4: Remote Operations

❓ What’s a Remote?

A reference to your hosted repository — usually called origin.

❓ git pull vs. git fetch

Command Action fetch Downloads changes (no merge) pull Fetch + Merge automatically

❓ Fork vs. Clone

Action Fork Clone Where GitHub account Your machine Purpose Collaboration Local editing

❓ What’s a Pull Request (PR)?

A PR is a proposal to merge your branch into another — includes code review, discussion, and approvals.

💡 Pro Tip: Always mention that PRs improve code quality and teamwork visibility.

🏷️ Section 5: Tags & Releases

Tags mark specific commits — great for versioning.

git tag -a v1.0.0 -m "First release"git push origin v1.0.0

💡 Lightweight tags → just a pointer 💡 Annotated tags → include author, date, and message (use these for releases)

⚙️ Section 6: Advanced Topics

❓ What’s GitHub Actions?

A CI/CD automation tool built into GitHub — triggers workflows like build, test, or deploy whenever you push or open a PR.

❓ GitHub Flow vs. Git Flow

GitHub Flow Git Flow Simple, continuous Structured with multiple branches Ideal for startups Perfect for enterprise main + feature branches main, develop, release, hotfix

💡 Pro Tip: Mention both — shows you understand real-world branching strategies.

❓ Handling Large Files?

Use Git LFS (Large File Storage) — stores big binaries outside Git’s main history.

❓ main vs. origin/main

Term Meaning main Your local branch origin/main The remote version on GitHub

🧭 Final Thoughts

Git isn’t just about commands — it’s about understanding why you’re doing what you’re doing. The moment you start thinking in snapshots, branches, and commits, you’re not just coding — you’re versioning like a pro.

✨ “Master Git, and you’ll never fear breaking your code again.”