Question 1

What are the most essential Git commands?

Accepted Answer

Essential commands include: git init (create repo), git clone (copy repo), git add (stage changes), git commit (save changes), git push (upload to remote), git pull (download changes), git branch (list/create branches), git checkout/switch (change branches), and git merge (combine branches).

Question 2

What is the difference between git merge and git rebase?

Accepted Answer

Git merge creates a merge commit combining two branches while preserving history. Git rebase rewrites history by moving commits to a new base, creating a linear history. Use merge for feature branches to main, rebase for updating feature branches with main changes. Never rebase public/shared branches.

Question 3

How do I undo changes in Git?

Accepted Answer

To unstage files: git reset HEAD . To discard working changes: git checkout -- or git restore . To undo last commit (keep changes): git reset --soft HEAD~1. To undo commit (discard changes): git reset --hard HEAD~1. To revert a pushed commit: git revert .

Question 4

What is git stash and when should I use it?

Accepted Answer

Git stash temporarily saves uncommitted changes so you can switch branches or pull updates. Use git stash to save, git stash pop to restore and remove from stash, git stash apply to restore and keep in stash, and git stash list to see all stashes. Great for quick context switches.

Question 5

How do I resolve merge conflicts?

Accepted Answer

When conflicts occur: 1) Open conflicted files and look for <<<<<<<, =======, >>>>>>> markers, 2) Edit to keep desired changes and remove markers, 3) Stage resolved files with git add, 4) Complete merge with git commit. Use git mergetool for visual conflict resolution.

Question 6

What is the best Git workflow for teams?

Accepted Answer

Popular workflows include: Git Flow (feature/develop/release/hotfix branches), GitHub Flow (feature branches + pull requests to main), and Trunk-Based Development (short-lived branches, frequent merges). Choose based on release frequency and team size. Always use pull/merge requests for code review.

Git Command Reference

Need Help with Development Workflows?

Frequently Asked Questions

Explore More Tools

Terraform Plan Explainer

HTTP Request Builder

CSV to JSON Converter

Excel to JSON Converter

YAML to JSON Converter

Diff Checker

ℹ️ Disclaimer