What Is Version Control? A Beginner’s Guide to Git

Have you ever saved a file as report_final_v2_REAL.docx? Git solves that problem for code, and for any text you care about. It remembers every version, lets you try ideas on a safe copy, and lets a team work on the same project without overwriting each other. In this tutorial you will install Git, make a repository, commit changes, branch, merge, fix a conflict and push your work to GitHub. There is also a practice terminal on this page that you can use right now, no install needed.

Why version control exists

Without version control, two people editing the same file send copies by email and then argue about whose version is the real one. A version control system keeps a timeline of snapshots, called commits. Each commit records what changed, who changed it and why. You can compare any two snapshots, go back to an old one, or work on a new idea without touching the working version.

Git was created in April 2005 by Linus Torvalds after the free licence for BitKeeper, the tool that the Linux kernel developers used, was withdrawn. He wanted a fast, distributed system, where every developer has the whole history on their own computer. Junio Hamano took over maintenance in July 2005 and released version 1.0 in December 2005.

Step 0: install Git and say who you are

Download Git from git-scm.com for Windows or macOS, or install it with your package manager on Linux (for example apt install git). Check that it works, then tell Git your name and email. They are attached to every commit you make.

git --version
git config --global user.name "Your Name"
git config --global user.email "you@example.com"
git config --global init.defaultBranch main

The one picture to remember: three areas

Step 1: your first repository

Open a terminal, make a folder and run the commands below. This is a real session that I ran with Git 2.43. I shortened the commit IDs and the folder path so they are easy to read, and everything else is as Git printed it.

$ git init -b main
Initialized empty Git repository in /home/you/project/.git/
$ echo "Hello Git" > hello.txt
$ git status
On branch main

No commits yet

Untracked files:
  (use "git add <file>..." to include in what will be committed)
	hello.txt

nothing added to commit but untracked files present (use "git add" to track)
$ git add hello.txt
$ git status --short
A  hello.txt
$ git commit -m "Add hello file"
[main (root-commit) 3f2a1bc] Add hello file
 1 file changed, 1 insertion(+)
 create mode 100644 hello.txt

Read the output slowly: the first status says the file is untracked, so Git sees it but is not recording it. After git add the letter A means added to the staging area. After git commit the file is safely stored in history.

Change something and look at the difference

$ echo "Second line" >> hello.txt
$ git diff
diff --git a/hello.txt b/hello.txt
index 8d0e412..b1a9c3f 100644
--- a/hello.txt
+++ b/hello.txt
@@ -1 +1,2 @@
 Hello Git
+Second line
$ git commit -am "Add a second line"
[main 7c9d0e4] Add a second line
 1 file changed, 1 insertion(+)

Lines starting with a plus sign were added and lines with a minus sign were removed. The -a in -am means stage all changes to files Git already tracks, which saves one step. New files still need git add.

Try it now: the practice terminal

This is a small simulator of Git that runs in your browser. Nothing you type here touches your computer. Follow the buttons in order, then try your own commands. Type help to see what is supported. It is a simplified model: it tracks commits and branches, not the contents of files.

Step 2: branch and merge

A branch is a movable label on a commit. Creating one is instant and cheap, so Git users make a branch for every new idea. You can experiment safely, and if the idea works you merge it back. Here is a real run, again with shortened IDs.

$ git switch -c feature
Switched to a new branch 'feature'
$ echo "Feature work" > feature.txt && git add feature.txt && git commit -m "Add feature file"
[feature a41b9d2] Add feature file
 1 file changed, 1 insertion(+)
 create mode 100644 feature.txt
$ git switch main
Switched to branch 'main'
$ git merge feature
Updating 7c9d0e4..a41b9d2
Fast-forward
 feature.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 feature.txt
$ git log --oneline
a41b9d2 (HEAD -> main, feature) Add feature file
7c9d0e4 Add a second line
3f2a1bc Add hello file

The merge was a fast-forward: main had no new commits of its own, so Git simply moved the main label up to the feature commit. If both branches had changed, Git would create a new merge commit instead, which the practice terminal also shows.

Step 3: fix a merge conflict

Conflicts sound scary but are simple. They happen when two branches change the same line. Git cannot guess which one you want, so it stops and asks you. This is what happens when two branches rename the same title differently, from a real run.

$ git merge feature
Auto-merging page.txt
CONFLICT (content): Merge conflict in page.txt
Automatic merge failed; fix conflicts and then commit the result.
$ cat page.txt
<<<<<<< HEAD
Title: My studio
=======
Title: My blog
>>>>>>> feature
$ git status --short
UU page.txt

Step 4: put it on GitHub

Git works on your computer. GitHub is a website that hosts Git repositories so you can back them up, share them and collaborate. Other hosts such as GitLab and Bitbucket work in a similar way. The steps are the same everywhere.

1. Create a free account on GitHub and click New repository. Give it a name. Do not tick the option to add a README, since your folder already has history.
2. Copy the repository address that GitHub shows you.
3. In your project folder, connect it and push: use the commands below.
4. Refresh the page on GitHub and you will see your files and commit history.

git remote add origin https://github.com/YOUR-NAME/YOUR-REPO.git
git push -u origin main

# later, to get other people's changes
git pull

Habits that make you look like a pro

• Commit small and often. One idea per commit is easy to understand and easy to undo.
• Write messages for humans. Say what and why: “Fix broken contact form email” beats “stuff”.
• Use .gitignore. List files that should never be tracked, such as .env, node_modules and build output.
• Branch for every feature or fix. Keep main working at all times.
• Pull before you push. It avoids most conflicts.

# example .gitignore
.env
node_modules/
*.log
.DS_Store

Cheat sheet

Troubleshooting

Test yourself

Mind map: Git at a glance

India and open source

Git is one of the reasons Indian developers can work on global projects from anywhere. GitHub’s 2024 Octoverse report counted more than 17 million developers in India on GitHub, growing about 28 percent in a year, and projected that India will become the largest developer community in the world by 2028. A public GitHub profile with real projects is one of the best portfolios a student can build.

Where to go next

Sources

• Git, Wikipedia, history, creator and survey figure
• Pro Git book (free), Scott Chacon and Ben Straub, the official free book on Git
• Octoverse 2024, GitHub, developer numbers for India

Command output was produced by running Git 2.43 in a test folder. Commit IDs and the folder path were shortened for readability.