How to Resolve Merge Conflicts in Git | Open Source Bootcamp

#opensource #webdevelopment #coding #programming #github #opensourcesoftware #nodejs #vscode #git

[airajena]

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. ❤

[hardickraj]

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.kritz]

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

[AnkurProjectShowcase]

next level lecture, I have understood everything

[Baloon_edits]

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

[SonuKumar-uqrb]

excellent guy . love u bro keep it up.

[surajkumar-vdje]

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

[uhbecii]

t-shirt collection badiya h apka 😅

anyway thank you so much for this series helping me a lot 😌

[sajaljain]

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

[rachelgreen]

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

[ashishkumarnath]

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?

[gersonjr]

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