Mastering Git and GitHub: A Comprehensive Guide

Continuous Integration and Continuous Delivery (CI/CD) are essential components of any software development lifecycle, particularly in the context of Machine Learning Operations (MLOps). Welcome to the first chapter of our CI/CD Series for MLOps where we will explore git and github- the ultimate version control tools.

Git and GitHub are essential tools in modern software development, enabling version control and collaboration among developers. This article explores their functionalities, key commands, and how to get started with them effectively.

What is Git?

Git is a distributed version control system created by Linus Torvalds in 2005. It allows developers to track changes in their code, manage different versions of their projects, and collaborate efficiently. Key features of Git include:

• Version Tracking: Maintains a history of changes, enabling users to revert to previous states of their code.

• Branching: Allows developers to create branches to work on features independently without affecting the main codebase.

• Merging: Seamlessly merges branches back into the main project once changes are finalized.

Git operates locally on a developer’s machine, allowing for offline work while still keeping a comprehensive history of changes made during the development process.

What is GitHub?

GitHub is a cloud-based platform that hosts Git repositories. It provides a collaborative environment where developers can share their code and work together on projects. Key functionalities of GitHub include:

• Repository Hosting: Stores your code online, making it accessible from anywhere.

• Collaboration Tools: Features like pull requests, issues, and code reviews facilitate teamwork and project management.

• Community Engagement: Serves as a hub for open-source projects and developer collaboration with millions of users worldwide.

Differences Between Git and GitHub

While often used interchangeably, Git and GitHub serve different purposes:

Git is the tool that manages versions of your code, while GitHub is the platform that allows you to host and share those versions with others.

Getting Started with Git and GitHub

Installing Git

Before using Git, ensure it is installed on your system. You can check the installation by running:

git --version

Configuring Git

Once installed, configure your Git environment with your username and email. This information will be associated with your commits.

git config --global user.name "Your Name"
git config --global user.email "[email protected]"

Git Stages

The below diagram summarizes everything you need to know about various stages while committing code and commands required to move between them.

• Working Directory (Unstaged):

  This is where you make changes to your files. When you modify a file, it’s only saved locally and remains unstaged. At this stage, Git is aware of the changes but hasn’t recorded them yet.

• Staging Area:

  The staging area is like a preparation zone for changes that you want to commit. Using the git add command, you can mark specific changes to be included in the next commit. This step lets you select exactly what you want to commit.

• Local Repository:

  The local repository contains your project’s history and all committed changes. When you use the git commit command, changes in the staging area are saved here as a new snapshot of the project. This repository is still on your local machine.

• Central Repository:

  The central repository (or remote repository) is where you share your work with others. Using the git push command, you can upload your local commits here, allowing others to access them. Conversely, git pull or git clone brings changes from the central repository to your local environment.

Creating a New Repository

To start tracking a project, navigate to your project directory and initialize a new Git repository. For this we will use github.

git clone https://github.com/ddcrpf/git-github-demo.git

Basic Workflow Commands

1. Check Status: See the current status of your repository.

    git status
   

2. Add Files: Stage files for commit.

    git add .           
    git add      
   

3. Commit Changes: Save staged changes to the repository.

    git commit -m "Your commit message"
   

4. View Commit History: Check the log of commits.

    git log
   

Advanced File Management

• View Differences: Check what has changed.

    git diff            
    git diff --staged   
  

• Unstage Changes: Remove files from staging area.

    git reset HEAD 
  

• Revert Changes: Discard changes in a file since the last commit.

    git checkout -- 
  

Branching and Merging

1. Create a Branch:

    git branch 
   

2. Switch Branches:

    git checkout 
   

3. Create and Switch to a New Branch:

    git checkout -b 
   

4. Merge Branches:

5. Delete a Branch:

    git branch -d            
    git branch -D            
   

Remote Repositories

1. Add a Remote Repository:

    git remote add origin 
   

2. Push Changes to Remote:

    git push -u origin master    
   

3. Fetch and Pull Updates:

    git fetch origin              
    git pull origin master        
   

4. Remove a Remote Repository:

    git remote rm 
   

Undoing Changes

Conclusion

Mastering Git and GitHub is essential for any developer today. These tools not only facilitate effective version control but also enhance collaboration across teams and projects. By understanding how to utilize both effectively, developers can improve their workflow, manage projects efficiently, and contribute to the vast community of open-source software development.

With this guide, you now have a comprehensive understanding of key concepts and commands in Git and GitHub that will help you navigate your development journey with confidence!

In the next chapter, we will look into AWS CodeBuild for fully managed continuous integration.