Explain the difference between git merge and git rebase.

Short answer: Both commands integrate changes from one branch into another, but they work differently: git merge combines the histories of two branches, creating a new “merge commit.” git rebase rewrites history by placing your branch’s commits on top of another branch, making it look like you developed your changes sequentially.

Explain a bit more

Real-world analogy: Merge: Like combining two storylines into one — you keep both histories. Rebase: Like rewriting your story so it appears you followed the main storyline all along. Example: If your feature branch has diverged from main, merging will keep both timelines, while rebasing will make it look like your branch was based on the latest main version all along.

Say this in the interview

1. Define — one clear sentence (the short answer above).
2. Example — relate it to a project like ShopNest or your real work.
3. Trade-off — when you would not use it.