logo studio roma
EN / ES

Back to Blog

Git Basic Guide

Pablo Romera foto

Pablo Romera 

/

 November 18, 2023 / 3 min read

Pablo Romera foto

Mastering the Basics of Git: A Comprehensive Guide

Dive deep into the world of Git with this basic guide project. Learn the essentials of managing and collaborating on software projects with our step-by-step guide on Git basics.

Introduction to Git Project Basic Guide

Welcome to the definitive guide on Git! Are you starting a new project and looking to harness the power of Git for version control and collaboration? You've come to the right place. This article provides a comprehensive and beginner-friendly journey through the basics of Git. We'll explore its fundamental concepts, practical usage, and best practices to efficiently manage your projects.

Getting Started

Setting Up Your First Git Project

Here, we'll create a new directory for our project, initiate Git, and rename the default branch from 'master' to 'main'. This change reflects a more inclusive terminology in the tech community.

mkdir my-project
cd my-project
git init

git branch -m master main

Making Initial Changes and Committing

After setting up, it's time to start working on your project. By doing this, you're adding all the new or changed files to the staging area and then committing them to your project with a message describing the commit.

git add .
git commit -m "Initial commit"

Linking with a GitHub Repository

To store your project remotely, link it to a GitHub repository. This step is crucial for backup and collaboration purposes.

git remote add origin [Repository-URL]

Pushing Changes to GitHub

Now, let's push our changes to the remote repository. This command uploads your code to GitHub, allowing others to see and contribute to your project.

git push -u origin main

Branching and Developing New Features

Creating a 'dev' Branch and Switching to it. Branching is a core concept in Git. It allows you to work on new features without disturbing the main codebase.

git checkout -b dev

Implementing New Features

Let's add a new feature to our project. These commands create a new file for your feature, add it to Git, and commit the changes.

echo "This is my new feature" > feature.txt
git add .
git commit -m "Add new feature"

Pushing the 'dev' Branch to GitHub

Push your development branch to GitHub. This allows team members to access and collaborate on the new feature.

git push -u origin dev

Integrating Changes from 'dev' into 'main'

Finally, merge your development work into the main branch and push the changes to GitHub. This step combines the new features with the main codebase and updates the remote repository.

git checkout main
git merge dev
git push origin main

Conclusion

Congratulations! You've just walked through the essential steps of setting up and managing a basic Git project. Remember, practice makes perfect. The more you use Git, the more comfortable you'll become. Happy coding!

Remember, the key to mastering Git is continuous learning and practice. Explore more advanced features, experiment with different workflows, and collaborate with others to deepen your understanding and skills.