Deep Dive In Git & Github For Devops Engineer

What is Git and why is it important?

Git is a distributed version control system (DVCS) that allows multiple developers to work together on the same project without stepping on each other toes. It gives you to track changes in your code and collaborate seamlessly with your team.

Importance of Git with Examples:

1. Version Control: Git allows developers to track changes to files and directories over time. This ensures that a comprehensive history of the project's development is maintained. For example, if you're working on a software project and you encounter a bug, you can use Git to trace back to the specific commit that introduced the bug and fix it.

2. Collaboration: Git enables multiple developers to work on the same project simultaneously. Each developer can work on their own local copy of the code, make changes, and then merge their changes back into the main codebase. For instance, if you and your colleague are both developing different features of an application, Git helps you merge your changes without conflicts.

3. Branching and Merging: Git allows you to create branches, which are independent lines of development. This is useful for experimenting with new features or isolating bug fixes. You can then merge these branches back into the main codebase when they are ready. For example, you can create a branch to work on a new feature, test it thoroughly, and then merge it into the main branch.

4. Code Reviews: Git facilitates code reviews by allowing developers to share their changes with others before merging them into the main codebase. This ensures that code quality is maintained and potential issues are caught early. For instance, you can create a pull request in Git to review and discuss the changes you've made with your team before merging them.

5. Rollbacks and Reverts: If a problem arises after a code change, Git makes it easy to roll back to a previous version of the code. This is helpful in case a new feature introduces unexpected issues. For instance, you can quickly revert to a stable state of the project if a critical bug is discovered after a release.

6. Open Source Collaboration: Git plays a crucial role in open-source software development. It allows developers from around the world to contribute to projects without needing direct access to the main repository. Contributors can fork the repository, make changes, and submit pull requests to have their changes considered for merging.

Example Scenario: Imagine you're part of a team developing a mobile app. You use Git to manage the project. Each team member creates a local copy of the repository. As you work on your assigned tasks, you make commits to your local repository to track your changes. When a feature is complete, you push your changes to a shared remote repository on a platform like GitHub. Your team members review the changes, and after approval, the changes are merged into the main branch. If a critical bug is discovered in the main branch, you can create a hotfix branch, fix the bug, and merge it back quickly, while the rest of the team continues their work in parallel.

What is the difference Between Main Branch and Master Branch?

Here's a table comparing the "main" branch and the "master" branch in Git repositories, along with corresponding examples:

Can you explain the difference between Git and GitHub?

Aspects	Git	GitHub
Owned by	Git is maintained by Linux	Is maintained by Microsoft.
Location	Git lives on the Developer's personal computer.	GitHub is a Cloud-based platform accessible through a web browser.
Application	Git is a Command-Line tool.	GitHub is a Graphical User Interface.
Storage	Is installed locally in the system for use and does not require the internet.	Can be accessed through the web browser. It needs an internet connection.
Usage	Developers use Git to work on their code locally and track changes efficiently.	Developers use GitHub to save their Git repositories in the cloud and collaborate with others.
User Preferences	Lacks user management features - It provides core version control functions like creating branches, committing changes and maintaining history.	GitHub has features like issue tracking, project management, code reviews and collaboration tools. It also provides Organisational and Enterprise level accounts with unlimited public repositories and collaborators.
Security	The privacy in Git is too strong	Privacy depends on the settings of the repositories.
Platform	It is compatible with Windows, macOS, Linux, Solaris, AIX	It is compatible with Windows, macOS, Linux, and all other web browsers.
Collaboration	Git is more suitable for individual developers working on their own projects or small teams working together locally.	GitHub brings developers together on a global scale, facilitating among multiple developers, teams, and open-source communities.

How do you create a new repository on GitHub?

Creating a new repository on GitHub is as easy as pie! Just follow these simple steps:

1. Sign in or Sign up: If you already have a GitHub account, sign in. If not, create a new account—it's quick and free on https://github.com/

2. Find the "+" sign: Once you're logged in, look for the "+" sign in the top-right corner of the page.

3. Click "New repository": Click on that "+" sign, and a menu will pop up. Choose "New repository" from the menu.

4. Name your repository: Give your new repository a cool name that describes what it's all about. You can be creative!

5. Add a description (optional): If you want to let others know what your repository is for, you can add a brief description.

6. Public or Private: Decide whether you want your repository to be visible to everyone (public) or just you and some friends (private).

7. Optional extras: You can also choose to add a README file (a cool way to introduce your project), a .gitignore file (to ignore certain files), and even a license to let others know how they can use your code.

8. Click "Create repository": Finally, when you're all set, click that button, and voilà! Your new repository is ready to go.

Difference between local & remote repository? How to connect local to remote?

Here's a comparison between local and remote repositories, presented in a table format:

How to connect local to remote?

To connect your local repository to a remote repository, we need to perform the below steps using Git, which is a widely used version control system.

Let's assume we already have a local repository set up on your computer and have created a remote repository on a platform like GitHub, GitLab, or Bitbucket.

Here's a step-by-step guide to connecting your local repository to a remote repository:

1. Obtain the Remote Repository URL:

   • Go to your remote code hosting platform (e.g., GitHub) and navigate to the repository you want to connect to.

   • Look for the "Clone" or "Code" button and copy the remote repository's URL. It should look something like: https://github.com/username/repo-name.git.

2. Open Terminal (or Command Prompt) on Your Local Machine:

   • Navigate to the directory where your local repository is located using the cd command (e.g., cd path/to/your/repo).

3. Set Up Git Configuration:

   • If you haven't already configured Git on your local machine, you may need to set up your name and email address. Use the following commands, replacing the placeholders with your actual name and email:

git config --global user.name "Your Name"
git config --global user.email "your@email.com"

1. Add Remote Origin:

   • Run the following command to add the remote repository's URL as the "origin" for your local repository. This step connects from local repository to the remote one:

git remote add origin <remote_repository_url>

• Replace <remote_repository_url> with the URL we have copied in step 1

1. Push to Remote Repository:

   • Now that the connection is established, you can push your local repository's code to the remote repository using the following command:

         git push -u origin main
     

   • The -u option is used to set the upstream branch, so you can use git push without additional arguments in the future.

2. Verify Connection:

   • After pushing the code, refresh the remote repository's web page (e.g., on GitHub). You should see your code and files from the local repository now available in the remote repository.

Your local repository is now connected to the remote repository, and you can start collaborating with others, push and pull changes, and manage version control across both local and remote environments.

Task 1: Set your user name and email address, which will be associated with your commits.

To set your user name and email address for commits using the following Git commands:

1. Set User Name: Use the following command to set your Git user name:

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

1. Set Email Address: Use the following command to set your Git email address:

git config --global user.email "your@email.com"

We have completed the blog on Git and GitHub.