How to Solve Merge Conflict in Git/Github - Hindi / Urdu Tutorial

If you want to learn more about ReactJS, Mobx and React Router V4 you can check out my course I offer support and continuous updating of these course as these technology changes and also it is the best way to support my channel
-------------------------------------
Enroll is Course For Just $10
-------------------------------------

Good Book
=========
Up and Running with ReactJS

Learn Object Oriented Programming in JavaScript

CSS Secrets: Better Solutions to Everyday Web Design Problems

Watch Other Videos in this Playlist
============================

Learn Git & Github Basics [ Part #1 ] - Hindi / Urdu Tutorial

Learn Branches in Git & Github [Part #2] - Hindi / Urdu Tutorial

Filter commit history with git log command - Learn Git & Github Basics [ Part #3 ]

Learn Stash Command - Learn Git and Github - Part #4

How to Stash chunk of code - Hindi / Urdu Tutorial [#5]

Understanding the GitHub Flow - Hindi / Urdu Tutorial [#6]

Understanding Git Cherry-pick - How to Use - Hindi / Urdu Tutorial [#7]

How to Implement SSH Authentication in Github - Hindi / Urdu Tutorial

How to Solve Merge Conflict in Git/Github Is Tutorial mai ham sikhege kaise merge conflict solve kar sakte hai jo aksar aek like jab do changes ate hai to git decide nahi kar pata hai ki kose like to rakhe aur kise dicard kare toh hame manually ye decision lena padta hai ki konsa code hame chaheye

[TECHBABAG]

Are Yaar Kya Gajab Smjhaya Hai EK Dum Pani Ki Tarah Ek baar mai Puri Playlist Dekh Gya. Thank You Bhai..

[ranajit]

Thank you brother, i have seen many video after getting this issue, but finally solved after watching your video.

[DebasmitSamal]

what an explanation. Beautiful. I loved it. It helped me a lot. Thank u so much

[rahathossain]

Bad idea, why you didn't show a way how to add two changes at a time.?