Git Branching aur Merge Kaise Kare – Complete Guide

Git Branching aur Merge Kaise Kare – Complete Guide (Beginner to Advanced)

Agar aap Git use kar rahe ho, to branching aur merging sabse important concept hai. Isse aap safely new features bana sakte ho bina main code ko disturb kiye.

Git Branch Kya Hota Hai?

Branch ek alag line hoti hai development ki jahan aap naye features ya changes test kar sakte ho bina main project ko affect kiye.

git branch

Ye command aapko sabhi branches dikhaega.

---

New Branch Kaise Banaye?

git branch feature-login

Ya direct create + switch:

git checkout -b feature-login

---

Branch Switch Kaise Kare?

git checkout feature-login

---

Branch Delete Kaise Kare?

git branch -d feature-login

---

Merge Kya Hota Hai?

Merge ka matlab hai ek branch ke changes ko doosri branch me add karna (usually main branch me).

---

Branch Merge Kaise Kare?

Step-by-step process:

Step 1: Main branch pe aao

git checkout main

Step 2: Feature branch merge karo

git merge feature-login

---

Complete Example

git checkout -b feature-login
git add .
git commit -m "login feature added"
git checkout main
git merge feature-login

---

Merge Conflict Kya Hota Hai?

Jab same file me do jagah change hota hai (different branches me), to Git confuse ho jata hai — isse merge conflict kehte hain.

---

Merge Conflict Kaise Resolve Kare?

git status

Conflict file open karo, manually fix karo, fir:

git add .
git commit -m "conflict resolved"

---

Rebase vs Merge

Feature	Merge	Rebase
History	Complex	Clean
Use	Safe	Advanced

---

Rebase Command

git checkout feature-login
git rebase main

---

Best Practices

• Har feature ke liye alag branch banao
• Main branch ko clean rakho
• Small commits karo
• Merge se pehle pull karo

---

Daily Workflow (Pro Level)

git checkout -b new-feature
git add .
git commit -m "feature added"
git checkout main
git pull --rebase
git merge new-feature
git push

---

Conclusion

Git branching aur merging seekhna har developer ke liye zaroori hai. Isse aap team me easily kaam kar sakte ho aur apna code safe rakh sakte ho.

Bonus Tip

Interview me aksar ye question aata hai: Merge vs Rebase — isse achhe se samajh lo.