How to Resolve Merge Conflicts in Git | Open Source Bootcamp

[@airajena5036]

Sir please don't stop making videos and completing this Masterclass. It's a blessing to have such a structured Content ,clean and smooth explaining of concepts and most importantly freely available. ❤

[@piyushgargdev]

Thank you ❤️

[@hardickraj8764]

This series is very helpful. I've learned a lot from you. I am practicing all these in my own project. Just after watching this video, When I started working on my project, I got a merge conflict error. And then I solved the error, just because of you and your helpful course.

[@artsy.kritz08]

this was very helpful !!! thanks a lot!! u definitely deserve more audience .

[@Baloon_edits]

I am in Firmware developer, after a long time i got beauty of teaching on git.

[@AnkurProjectShowcase]

next level lecture, I have understood everything

[@user-uh4be8ci7i]

t-shirt collection badiya h apka 😅 anyway thank you so much for this series helping me a lot 😌

[@klyist]

🔥🔥🔥🔥 waiting for today live

[@ashishkumarnath3563]

Piyush Bhai, at 21:59 The Incoming change should be 30, as the change you made in repo was const age = 30, but in your vscode it is showing as const age = 26, const age = 26 should be current change.... kuch bug tha kya yeh?

[@techpass-sk3vb]

If you check the previous example when he pulled code in vscode its the same way, basically current change is the latest change on upstream and incoming is your change that you will make.

[@biswajitmohapatra2172]

Doubt clear 🎉, well explained 👍🏻

[@piyushgargdev]

Thank you ❤️

[@aadarshgurug]

Thumbnail is amazing 😅

[@SonuKumar-uq2rb]

excellent guy . love u bro keep it up.

[@surajkumar-vd4je]

Hi Piyush, will you add one video in this playlist which covers git and github for beginners?

[@ankushladani496]

Thanks Bhaiya ❤

[@gourabhere2005]

Thanks bhaiya it was needed

[@rachelgreen9754]

Can you help me with this?? I try to run the code but only a part of the code gets run and i cant find the main file which i should run because of soo many files in folder

[@sajaljain2885]

Why there was no conflict when you commit first time, from 'c' to 'age', than also there were changes in same code line

[@brosgaming108]

Thanks a lot

[@piyushgargdev]

Most welcome

[@GautamKumar-29]

Awesome 👍

[@BSSAPP]

We like your videos 👍

[@lovishduggal9064]

Thanks

[@gersonjr7302]

I would appreciate if you keep speeking in Inglish with out changing language the whole video. That would be awesome.

[@mandorakannu]

❤❤🎉