DevOps(Day-13): Git Rebase vs. Merge: A Complete Guide

 

Git rebase is a command that lets users integrate changes from one branch to another, and the logs are modified once the action is complete. Git rebase was developed to overcome merging’s shortcomings, specifically regarding logs.

Git merge is a command that allows developers to merge Git branches while the logs of commits on branches remain intact.

The merge wording can be confusing because we have two methods of merging branches, and one of those ways is actually called “merge,” even though both procedures do essentially the same thing.

In summary, here’s an image that shows an initial branch, a Git rebase, and a Git merge.

Git rebase takes all the changes, and compresses them into a single patch and integrates this new patch onto the target branch. Then, it moves the completed work from one branch to another, typically the master branch. In the process, rebase flattens the history, removing unwanted entries.

Git merge, on the other hand, only changes the target branch and creates a commit, preserving the history of the source branch.

Both the rebase and merge commands exist for the same reason: they combine the work of multiple developers into a single entity, integrating changes between branches. That about sums up their similarities. On the other hand, their differences are considerably more profound.

It’s possible to use both Git rebase and Git merge in the same project. For example, you can work on a feature branch, create another feature branch off it, make your changes, and finalize them as commits. You could then Git merge both feature branches, then use a Git rebase to merge the feature branches into the main branch. This way, you, as the developer, can do you work on a feature branch, but other team members won’t see it when they look at the main branch.

Put another way; you can use Git rebase to work on a private branch, then do Git merge to bring everything together into one coherent timeline.

Git reset,revert are powerful commands that undoes changes, moving the repository back to a previous commit, and eliminating any changes made after the commit. It’s literally undoing changes.

Comments

Post a Comment

Popular posts from this blog

DevOps(Day-97): Meta-Arguments in Terraform

Image
  TABLE OF CONTENTS Write about meta-arguments and their use in Terraform. Task-01: Meta-Arguments HandsOn Count for-each When you define a resource block in Terraform, by default, this specifies one resource that will be created. To manage several of the same resources, you can use either count or for_each, which removes the need to write a separate block of code for each one. Using these options reduces overhead and makes your code neater. count is what is known as a ‘meta-argument’ defined by the Terraform language. Meta-arguments help achieve certain requirements within the resource block. Write about meta-arguments and their use in Terraform. Meta-arguments in Terraform refer to a set of special arguments that can be used to define how a particular resource or module behaves within a Terraform configuration. These arguments provide additional configuration options and enable fine-grained control over the behaviour of resources or modules. Meta-arguments are prefixed with the...
Read more

DevOps(Day-95): Auto Scaling with Terraform

Image
  TABLE OF CONTENTS Understanding Scaling Pre-requisites Task 1: Create an Auto Scaling Group Task 2: Test Scaling Yesterday, we learned how to AWS S3 Bucket with Terraform. Today, we will see how to scale our infrastructure with Terraform. Understanding Scaling Scaling is the process of adding or removing resources to match the changing demands of your application. As your application grows, you will need to add more resources to handle the increased load. And as the load decreases, you can remove the extra resources to save costs. Terraform makes it easy to scale your infrastructure by providing a declarative way to define your resources. You can define the number of resources you need and Terraform will automatically create or destroy the resources as needed. Pre-requisites Create a  terraform.tf  file declaring the providers to be installed in the system according to the resources required. Create a  provider.tf  file to declare the region. Create a  vp...
Read more

DevOps (Day-1) Introduction

Image
  TABLE OF CONTENTS Infrastructure Automation Why DevOps is Important? What is DevOps? As the name indicates:- Dev + Ops = Development + Operations. Development i) Backend Developers ii) Front-end Developers iii) QA Operations i) System admins ii) Network admins iii) Database admins The practice of operations and development engineers participating together in the entire service lifecycle through a pipeline from design through the development process to production support. This process is known as DevOps. This is a process of automating the whole infrastructure. Now here comes a query, what are we automating? We are automating the whole team's work from the code-building stage to code deployment. Scenario 1:- In a company, there is a project in which developers are writing the code and deploying it to the QA environment frequently for each sprint. This code is then tested by the testing team. Suppose there is a situation of mishap happens where the testing team used the older code ...
Read more