Merge Conflicts
MERGE, CONFLICT, TAB, hota hai, JAB, DONO, branches, ne, SAME, LINE, ko, DIFFERENT, TAREEKE, se, CHANGE, kiya, ho — Git, KHUD, DECIDE, NAHI, kar, sakta, ki, KAUNSA, VERSION, RAKHNA, hai.
CONFLICT, MARKERS, ko, MANUALLY, EDIT, kar, ke, DESIRED, CONTENT, RAKHNA, PADTA, hai — PHIR, "git, add" karke, "git, commit" se, merge, COMPLETE, karna, PADTA, hai.
<<<<<<< HEAD
const greeting = "Hello";
=======
const greeting = "Hi";
>>>>>>> feature-branch- Merge conflict = same line par dono branches ne different changes kiye
- Conflict markers (<<<<<<<, =======, >>>>>>>) manually resolve karne padte hain
- Resolve karne ke baad git add + git commit se merge complete hota hai
MERGE, CONFLICT, TAB, hota hai, JAB, DONO, branches, ne, SAME, LINE, (ya, NEARBY, LINES) ko, DIFFERENT, TAREEKE, se, CHANGE, kiya, ho — Git, KHUD, DECIDE, NAHI, kar, sakta, ki, KAUNSA, VERSION, RAKHNA, hai, ISLIYE, MANUAL, RESOLUTION, ki, ZAROORAT, PADTI, hai.
<<<<<<< HEAD
const greeting = "Hello";
=======
const greeting = "Hi";
>>>>>>> feature-branchCONFLICT, MARKERS, (<<<<<<<, =======, >>>>>>>) ko, MANUALLY, EDIT, kar, ke, DESIRED, CONTENT, RAKHNA, PADTA, hai, — PHIR, "git, add" karke, "resolved" MARK, karna, PADTA, hai, aur, "git, commit" (ya, "git, merge, --continue") se, merge, COMPLETE, karna, PADTA, hai.