#145 Difference between git pull vs git merge ?

git pull vs git merge: 

🔹 1. git pull

• Definition:
  • A single command that fetches changes from a remote branch and merges them into your current branch.

  • Equivalent to running:

    git fetch
    git merge origin/<branch-name>
    

• Usage:

  git pull origin main
  

  👉 Gets the latest changes from the remote main branch and merges into your local main.

• Key Point:
  • It directly updates your branch with remote changes.
  • Faster, but you may not notice merge conflicts until after running it.

---

🔹 2. git merge

• Definition:
  • A command to combine two branches.
  • Used locally when you already have both branches.

• Usage:

  git checkout main
  git merge feature-branch
  

  👉 Merges changes from feature-branch into main.

• Key Point:
  • You control when and what branch to merge.
  • Doesn’t automatically fetch remote updates.

---

🔹 Comparison Table

Feature	git pull 🟢	git merge 🔵
Purpose	Fetch + merge remote changes into current branch	Merge one local branch into another
Scope	Works with remote → local	Works with local → local
Internally Does	git fetch + git merge	Only merge
Use Case	Keep local branch updated with remote	Combine feature branch into main/dev
Example	git pull origin main	git merge feature-branch

---

🔹 Example Flow

1. You’re on main branch:

   git pull origin main
   

   👉 Brings remote main updates into your local main.

2. You finished working on feature-1 branch and want to merge into main:

   git checkout main
   git merge feature-1
   

   👉 Combines feature-1 changes into main.

---

✅ In short:

• git pull = fetch + merge from remote.
• git merge = merge one branch into another (local operation).