Understanding Merge and Rebase in Git

 As Raees Qazi, founder and CEO of Briller Technologies, I’ve learned that understanding Git is fundamental to successful DevOps practices and efficient collaboration. Today, let’s dive into two essential Git concepts: merge and rebase. Understanding these commands will empower your development workflow, ensuring smooth integration and clear version control.


Merge

Imagine you have two branches: master and dev. Developers work in the dev branch, committing changes as they progress. After rigorous testing, you decide to incorporate these changes into the master branch. This is where the git merge command comes in.

Steps for Merging:

  1. Switch to the master branch:
  • git checkout master

2. Merge the dev branch into master:

  • git merge dev

This command incorporates all changes from the dev branch into the master branch, maintaining a history of commit IDs. It’s like merging two streams into one while preserving the flow of both.

Key Benefits of Merge:

  • Retains the history of both branches.
  • Maintains a clear commit tree, which can be useful for understanding the development timeline.

Rebase

Now, let’s discuss rebase, which is another way to integrate changes between branches. Consider this scenario: A developer has been working on the dev branch but goes on leave for 5–10 days. Upon returning, they’re unsure of the changes made in the master branch during their absence. Using the git rebase command, they can align their branch with the latest changes from master while creating a linear commit history.

Steps for Rebasing:

  1. Switch to the dev branch:
  • git checkout dev
  1. Rebase the dev branch onto master:
  • git rebase master

This process applies commits from the dev branch on top of the latest commits in the master branch, ensuring a clean and linear commit history.

Handling Diverging Heads:

Sometimes, the master branch on your remote (e.g., GitHub) and your local master branch can diverge. To synchronize them and reapply commits linearly, use the following command:

git pull origin master --rebase

Key Benefits of Rebase:

  • Produces a linear and cleaner commit history.
  • Makes it easier to review changes during code reviews.

Choosing Between Merge and Rebase

Both merge and rebase have their advantages, and the choice depends on your workflow:

  • Use Merge when you want to preserve the complete history and context of feature branches.
  • Use Rebase for a cleaner history, especially when sharing work with others.

Here is the YouTube Link: https://youtube.com/@raeesq.?si=v_QK6Q2XXMf9mKep

At Briller Technologies, we’ve found that a thoughtful approach to using merge and rebase is critical for maintaining a seamless and efficient development process.

Hopefully, this blog helps clarify these concepts. If you found it useful, share it with your colleagues and stay tuned for more DevOps insights from Briller Technologies!

Comments

Post a Comment

Popular posts from this blog

📘 Understanding Prometheus in a Simple Way-Part 3 (For DevOps Beginners)

Image
 In our previous blogs, we have already covered: How to launch an EC2 instance (Link: https://medium.com/@raeesyaqubqazi/prometheus-and-grafana-project-part-1-by-raees-yaqoob-qazi-12eb5c431350 ) How to run our Notes App inside a Docker container (Link: https://medium.com/@raeesyaqubqazi/prometheus-and-grafana-project-part-1-by-raees-yaqoob-qazi-12eb5c431350 ) How to install cAdvisor to collect container-level metrics (Link: https://medium.com/@raeesyaqubqazi/monitoring-containers-with-cadvisor-part-2-of-my-previous-blog-series-cec2452b1ba5 ) Today, we will move one step ahead and learn Prometheus , which will collect the metrics generated by cAdvisor. 🔍 What Is Prometheus? Before understanding Prometheus, let’s talk about how data is stored in databases . ✔️ Relational Databases (MySQL, PostgreSQL) Data is stored in rows and columns  — like an Excel sheet. ✔️ Prometheus (TSDB — Time Series Database) Prometheus does NOT store data in tables.  It stores data in Time Series fo...
Read more

Grafana Setup & Dashboard Creation (Part-5)— Explained by Raees Yaqoob Qazi

Image
 Today, I’m going to talk about Grafana . Grafana is a powerful tool used to create dashboards and visualize data . As DevOps engineers, monitoring is very important, and Grafana makes it easy to understand system performance. Part-1:  https://brillertechnologies.blogspot.com/2025/11/prometheus-and-grafana-projectpart-1-by.html Part 2:  https://brillertechnologies.blogspot.com/2025/11/monitoring-containers-with-cadvisorpart.html Part 3:  https://brillertechnologies.blogspot.com/2025/12/understanding-prometheus-in-simple-way.html Part 4: https://brillertechnologies.blogspot.com/2025/12/understanding-prometheusmonitoring-made.html 1. Running Grafana Using Docker Compose First, I use Docker Compose to run Grafana. Open your docker-compose.yml file: vim docker-compose. yml Add the Grafana service: grafana: image: grafana/grafana-enterprise container_name: grafana restart: unless-stopped ports: - "3000:3000" Save and exit with:   :wq Then run: d...
Read more

My First Python Program: A Simple Calculator

Image
 Today, I am going to create a simple calculator using Python . This might be your first code ever , and honestly, this is also my first Python code . So don’t worry — we are learning together. Let’s start step by step. Step 1: Open VS Code First, open Visual Studio Code (VS Code) . Step 2: Create a Folder and a File Create a new folder (you can name it anything). Inside the folder, create a new file. In my case, I named the file first.py . 👉  .py is the file extension for Python , just like: .cpp for C++ .java for Java Step 3: Write the Python Code Now, write the following code in first.py : num1 = float ( input ( "Enter num 1: " ) ) # Taking first number from the user num2 = float ( input ( "Enter num 2: " ) ) # Taking second number from the user opr = input ( "Enter operator: " ) # User selects the operator (+, -, *) if opr = = "+" : # If operator is + output = num1 + num2 if opr = = "-" : # If operator is - ...
Read more