Mastering Git Cherry-Pick: A Guide by Raees Yaqoob Qazi

 Today, I explored an interesting Git feature: cherry-pick. Let me share what I learned and how it can make your development process more efficient.

Imagine you’re working on a feature in the dev branch, and you’ve made several commits. However, only one specific change (commit) is ready to be merged into the main branch. Instead of merging the entire dev branch and introducing incomplete features, you can use cherry-pick to select and apply just the desired commit.



Here’s how cherry-pick works:

  1. Scenario:
  • The main branch (master) has these commits: commit 1, commit 2, commit 3.
  • The dev branch has additional commits: commit 4, commit 5, commit 6.
  • You only want to add commit 5 from the dev branch to the main branch.

2. Commands to Use:

  • Switch to the dev branch:
  • git checkout dev
  • View the commit history and copy the commit ID of commit 5:
  • git log --oneline
  • Switch to the main branch:
  • git checkout main
  • Cherry-pick commit 5 into the main branch:
  • git cherry-pick <commit ID 5>

3. Outcome:

  • Only commit 5 from the dev branch is now part of the main branch.

Why Use Cherry-Pick?

This method is incredibly useful when you need to:

  • Apply a bug fix or a specific feature to the main branch without merging incomplete or unrelated changes.
  • Maintain a clean commit history in your project.

Wrapping Up

I hope this explanation simplifies the concept of cherry-picking for you. It’s like magic (jaddu), allowing you to fine-tune your Git workflow with precision.

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

If you found this helpful, don’t forget to follow, share, and subscribe to stay updated on more development tips!

Happy coding!

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