Advanced Git and GitHub for DevOps
What is Branching?
Git branching is a feature of the Git version control system that allows developers to create separate branches for development within the project. Each branch represents a different path of development, and it enables multiple people to work on different features or bug fixes simultaneously without interfering with each other's work.
Main Branch: It is usually the master or main branch. This is the default branch and the stable branch of the project.
Feature Branch: This branch works on new features or enhancements. Once the feature is complete the changes are merged back into the main branch.
Bug Fix Branch: When any bug is discovered you can create a bug fix branch to debug the issue.
Release Branch: This branch is created for new software releases.
Git Revert and Reset
`git revert` is the command we use when we want to take a previous commit and add it as a new commit, keeping the log. It's a safe way to revert changes while preserving the commit history.
git revert <commit-hash>
Git Reset:
`git reset` is the command we use when we want to move the repository back to a previous commit, discarding any changes made after that commit.
There are 3 types of git reset
git reset --soft <commit-hash>
git reset --mixed <commit-hash>
git reset --hard <commit-hash>
Git Rebase and Git Merge
`git rebase` is the process of moving or combining a sequence of commits to a new base commit.
`git merge` is used to combine the changes from two or more branches into a single branch.