Basic Git Knowledge Transfer — Part two

Written By: Rahul Goraksha

So in today’s blog after looking at the cover image you might have got some idea, this will be covering the main core part of Git which mainly consist of the Master branch and its branching strategies as well as how to pull the changes from the Master branch into a local repository by making some or the other commit and pushing the assigned changes into the remote repository.

Git Branch:

Figure 1: Git Branches Schematic Diagram

The role of the branch is to provide an isolated space for the development work, without impacting other branches in the project repository. Each repository has one default branch and can have multiple other branches. We can merge a branch into another branch using a pull request.

However, branches allow you to develop features fix bugs or safely experiment with new ideas. But there are several branching strategies being employed in industrial sectors some of them which are explained in detail.

Figure 2: Branching Strategies

What is Branching Strategies?

In Branching Strategies mainly deals with managing and organizing the overall development process of a software project using branches.
It mainly help team members to work collaboratively, an maintain a proper pipeline for the code base. However, there are several branching strategies exits. Some of them are explained below in detail

\> Feature Branching

Figure 3: Schematic Diagram of Feature Branching

In this strategy, we perform task in the Developer branch that helps to work in isolation by preventing unfinished feature getting affected to the Master branch. Once all the commit is done than only the branch is merge with origin .

\> Git Flow

Figure 4: Schematic Diagram of Git Flow

It is a branching model that defines specific branches for different stages of development.

• Master: Represent the stable branch, production-ready code.

• Developer: Acts as an integration branch for ongoing development.

• Feature branches: Created for new features and merged into Developer.

• Release branches: Used to prepare code for a release, bug fixes go here and then merged into Master and Developer.

• Hotfix branches: Created to address critical issues in the Master branch and then merged back into both Master and Developer.

What is the Difference between a Main branch and a Master Branch?

In essence, the primary difference is in the naming convention and the corresponding cultural and societal factors. Whatever name is chosen, the main/master branch will continue to provide the same functions. It acts as the main branch in a version control system, frequently indicating the most reliable and recent version of the codebase.

# Major Distinguish Between Git Rebase and Git Merge

Figure 5: Difference Between Git Action

Thank you for being a part of this adventure once more. I want to connect with you in future blog postings. Continue to be interested, inspired, and evolving.

Rahul Goraksha