Git Lesson 2: Creating Your First Repository and Basic Git Operations

Introduction

Are you ready to take your version control skills to the next level? Git, a powerful version control system, allows you to track changes in your codebase efficiently. While there are graphical Git clients available, mastering Git in the terminal gives you more control and a deeper understanding of how it works. In this comprehensive guide, we will walk you through the essential Git commands and provide plenty of examples to help you become a Git pro.

Getting Started

Before you dive into the world of Git, you need to set it up on your system. If you haven’t already, download and install Git from the official website.

To check if Git is installed and configured correctly, open your terminal and run:

git --version

This command should display the installed Git version.

Creating Your First Git Repository

Step 1: Initialize a New Repository

To start using Git in a project, navigate to your project’s directory in the terminal and initialize a new Git repository:

git init

Step 2: Adding Files

Add files to the staging area using the git add command. For example, to add all files in the current directory, use:

git add .

Step 3: Committing Changes

Commit your changes with a descriptive message:

git commit -m "Initial commit"

Basic Git Operations

Checking the Status

To check the status of your repository, including which files are staged or modified, use:

git status

Viewing Commit History

View the commit history with:

git log

Creating Branches

Create a new branch to work on features or fixes:

git branch new-feature

Switching Branches

Switch to a different branch:

git checkout new-feature

Collaborating with Remotes

Adding a Remote Repository

To collaborate with others, you’ll need to add a remote repository:

git remote add origin <remote-url>

Pushing Changes

Push your local changes to the remote repository:

git push origin <branch-name>

Pulling Changes

Fetch and merge changes from the remote repository:

git pull origin <branch-name>

Resolving Conflicts

Conflicts can arise when multiple people work on the same code. Here’s how to resolve them:

Step 1: Fetch Remote Changes

git fetch origin

Step 2: Merge or Rebase

Merge or rebase your changes with the remote branch. Resolve conflicts manually if needed.

Step 3: Commit Changes

Commit the resolved changes:

git commit -m "Merge conflict resolved"

Conclusion

This comprehensive guide covers the fundamental Git commands and workflows in the terminal. Git is a versatile tool with many advanced features, so don’t hesitate to explore its documentation and experiment with different commands to become a Git expert.

Remember, practice makes perfect, and the more you use Git in the terminal, the more comfortable and proficient you will become. Happy coding!

Ready to become a Git pro? Start using Git in the terminal today! 🚀