How to Use Git on Windows: A Step-by-Step Guide for Beginners

Git is an essential tool for software development, providing version control that allows you to track changes, collaborate with others, and maintain a history of your project. While Git is powerful, getting started on Windows can feel intimidating if you’re new to it. In this guide, we’ll walk through how to set up and use Git on Windows, from installation to basic commands, so you can manage your projects efficiently.

Why Use Git?

Git offers several benefits, including:

• Version Control: Track every change in your project history, enabling you to revert to previous versions if necessary.
• Collaboration: Work with other developers seamlessly, whether on small teams or large open-source projects.
• Branching and Merging: Create separate branches for features or bug fixes, which you can merge into the main project once complete.

Step 1: Install Git on Windows

To start using Git on Windows, you’ll need to install it:

1. Download Git: Go to the official Git website and download the latest Git for Windows installer.
2. Run the Installer: Open the downloaded installer file. During installation, you’ll be prompted to select options such as a default editor and environment preferences. If you’re new to Git, it’s generally safe to go with the default settings.
3. Verify Installation: Open the Command Prompt (search for “cmd” in the Start menu), and type:

   git --version

This command should return the installed Git version, confirming a successful installation.

Step 2: Configure Git on Windows

After installation, you need to configure Git with your identity so that your commits are associated with your name and email:

1. Set Your Username:

   git config --global user.name "Your Name"

2. Set Your Email:

   git config --global user.email "[email protected]"

These settings will apply to all Git repositories on your system. To set project-specific settings, omit the --global flag.

Step 3: Create a Git Repository

You can now create a Git repository to start tracking a project:

1. Open Command Prompt: Navigate to the folder where you want to create the repository.
2. Initialize a Repository:

   git init

This command will create a .git folder, indicating that Git is now tracking this project.

Step 4: Basic Git Commands

Here are some essential Git commands to start working with your repository:

1. Checking Repository Status

The git status command shows the current status of your working directory, including tracked, untracked, modified, or staged files:

git status

2. Adding Files to Staging

Before committing changes, you need to add files to the staging area using git add. This command prepares files for the next commit:

• To add a specific file:

  git add filename.txt

• To add all modified files:

  git add .

3. Committing Changes

The git commit command captures the changes in the staged files. Each commit should include a meaningful message describing what was done:

git commit -m "Describe your changes here"

4. Viewing Commit History

To view the history of commits, use:

git log

For a simplified log, use:

git log --oneline

Step 5: Working with Branches

Branches allow you to work on features or bug fixes separately from the main codebase:

1. Creating a New Branch:

   git branch branch-name

2. Switching to a Branch:

   git checkout branch-name

3. Merging Branches: Once your work is complete, you can merge a branch back into the main branch (often called main or master):

   git checkout main
   git merge branch-name

4. Deleting a Branch: After merging, you can delete the branch if it’s no longer needed:

   git branch -d branch-name

Step 6: Push and Pull with a Remote Repository

To share your code or collaborate with others, you’ll likely use a remote repository on a platform like GitHub.

1. Adding a Remote Repository

To link your local repository to a remote, use:

git remote add origin https://github.com/username/repository-name.git

Replace username and repository-name with your GitHub username and repository name.

2. Pushing Changes

After committing, you can push your changes to the remote repository:

git push -u origin main

The -u flag sets origin/main as the default upstream branch, so future pushes can be done with just git push.

3. Pulling Changes

To fetch and integrate changes from the remote repository, use:

git pull origin main

Step 7: Using Git in Visual Studio Code

Visual Studio Code offers built-in Git integration, making it easy to work with repositories through a graphical interface:

1. Open the Source Control Panel: Click on the Source Control icon (the branch icon) in the Activity Bar on the left.
2. View Changes: You can see changes, stage files, and commit directly from VS Code.
3. Push and Pull: Use the UI to push and pull changes, or open the terminal within VS Code for Git commands.

Troubleshooting Common Issues

1. SSH Key Setup for Authentication

If you’re prompted for a password when pushing to GitHub, consider setting up SSH authentication:

1. Generate an SSH key:

   ssh-keygen -t ed25519 -C "[email protected]"

2. Add the key to your GitHub account under Settings > SSH and GPG keys.

2. Resolving Merge Conflicts

If there’s a conflict when merging branches, Git will notify you. Open the conflicting files, resolve the differences, then add and commit the resolved files.

git add conflicted-file.txt
git commit -m "Resolved merge conflict"

Conclusion

Using Git on Windows may seem daunting at first, but by following these steps, you can establish a strong foundation in Git version control. From initializing repositories to working with branches and collaborating on remote repositories, Git empowers developers to manage code changes efficiently.

With practice, Git will become an invaluable tool in your workflow, enabling you to track changes, collaborate seamlessly, and maintain project history with ease.