Git merge and git conflicts

Подписаться 923 тыс.

Просмотров 18 тыс.

50% 1

Welcome to a youtube channel dedicated to programming and coding related tutorials. We talk about tech, write code, discuss about cloud and devops. That’s what we do all day, all year. We roll out a lot of series and videos on our channel.
All the learning resources such as code files, documentations, articles and community discussions are available on our website:
chaicode.com/
You can find our discord link, github link etc on the above website.
Twitter/X link: x.com/hiteshdotcom
Discord link: hitesh.ai/discord
Learn React with 10 projects: • Let's learn react from...
Learn Docker: • A practical guide on D...
Learn Kubernetes: • Complete Kubernetes Co...
How does a browser works: • How does a browser wor...
How nodejs works: • How node JS works | En...
Learn Redux-toolkit: • Learn Redux Toolkit in...
Learn NextJS: • Nextjs Full stack course
Learn Typescript: • Why to learn Typescript
Learn Javascript: • Welcome to new JavaScr...
Learn React Native: • React Native Mastery: ...
Learn Zustand: • React state management...
Learn Golang: • How to get started wit...

Развлечения

Опубликовано:

30 мар 2024

Ссылка:

Скачать:

Готовим ссылку...

Добавить в:

Мой плейлист

Посмотреть позже

Комментарии : 70

@ravigrover1923 3 месяца назад

It helped me understand merge conflicts with greater clarity, Thanks again!

@sumedhux 3 месяца назад

Thanks for the series definitely watch and share this for sure

@ankushladani496 3 месяца назад

I finally got a clear idea about the merge conflict. Thanks...❤

@abuanfaal381 Месяц назад

The way you explain is amazing. Best git course I’ve come across on RU-vid! Appreciate it

@sivasai6890 3 месяца назад

Nice going sir. Keep rocking with more series. Thanks a lot

@soniyaprasad77 3 месяца назад

I am happy happy after a clear understanding of branching, Thankyou :)

@NeedToKnow. Месяц назад

The way you precisely explained this conflict topic is just unmatched.

@fasty703 2 месяца назад

I had previously studied git and GitHub and practiced it but you helped me understand it more deeply and resolved my doubts ....thank you sir

@vishwanatha6859 3 месяца назад

really helped a lot to understand the merge conflicts. Thank you !!

@chhavimanichoubey9437 3 месяца назад

Some time ago I've started learning about merge conflicts and only today I get it because of this video.

@mahmoudelwan4337 Месяц назад

This might be the first tutorial I've seen that actually cares about concepts and general understanding instead of jumping into code and commands

@bhavyakantawala19 3 месяца назад

This is such an awesome series!!

@ANEEQAHMED-in6nz 3 месяца назад

Thankyou for whole Git series

@anandstephan6020 3 месяца назад

thanks sir for the videos after this video i know the internal working of merging the branches.

@amarnatha1614 3 месяца назад

Sir, i appreciate your way of teaching...I really enjoyed it

@sarth8065 3 месяца назад

I have faced a lot of merge conflicts, and I always wondered why it's happening. Now I know what exactly is happening. Thank you, Sir!

@user-hx1mx5vu5t 3 месяца назад

good series with packed knowledge thank you hitesh ji :)))

@MathsWithSatyamPandey 3 месяца назад

आँखों मे नींद है सर और आप video create कर रहे है। आपके dedication को सलाम ❤ love you sir from chai aur code RU-vid channel 🙏

@2amCoder 3 месяца назад

this was absolutely crazy ! HATS OFF TO YOU SIR!

@debabratabar2008 2 месяца назад

The best indepth video on git internal working in whole youtube

@charishmayerra2531 28 дней назад

Hi , thank you for explaining in detail. I have doubt: How index.html file is still visible when we checkout to nav-bar branch. can you please explain. i am new to git.

@anubhavseet004 Месяц назад

Hello Sir really enjoying your git series.

@Najir.Social 2 месяца назад

Regular viewer from chai aur code channel ❤

@ExploreSciFi 2 месяца назад

me too ♥ ♥

@RandomRaju-zb8vf 3 месяца назад

DSA in JS please Sir 🙏🙏🙏🙏🙏 I am so much afraid of DSA and your way of teaching is very good as i am currently Full Stack web developer in Startup company because of your way of explanation.... Please sir bring DSA in Js 🙏🙏🙏🙏

@abhijitpradhan7860 3 месяца назад

thank you sir ji for this type of content

@_Hero_24 3 месяца назад

so much informative lecture

@tanvirahammadjoy 3 месяца назад

Thank you so much 😊 ❤sir for everything…

@vikassahani2874 3 месяца назад

Should we use git & GitHub on Ms word & Ms Excel files?

@yogeshkamble1500 2 месяца назад

Absolutely fantastic content! This channel provides the best tech tutorials I've ever come across. The explanations are clear, concise, and incredibly helpful for both beginners and advanced users. Keep up the amazing work! 🌟🚀 #HiteshChoudhary #Chaiaurcode #GitLearning

@codevalley9511 3 месяца назад

Thank you very much

@AmanKumar-cu5qs 3 месяца назад

thanks for this video waiting for videos which cover push-pull conflict also and force merge/conflict too sir #chaiorcode #30thcomment

@awaizdottech 2 месяца назад

wasnt able to figure out how to get that diagram via gitlens in the beginning

@MoroNjie 3 месяца назад

when do we use --ff-only and will you also be discussing about rebase?

@RohitChhabirajYadav 3 месяца назад

Thank you sir

@bishal.dangol 3 месяца назад

github or gitlab, which is best for a student?

@DeviKumavath 2 месяца назад

thank you

@aastikofficial6100 20 дней назад

26:40 its a pretty dangerous option thats why -d oh hitesh sir rock😂 ❤

@amitkr_15 3 месяца назад

understand the conflicts 😀😀

@bilal.mansuri 3 месяца назад

Sir what is the right time to learn Typescript, after JS backend or before

@AmanKumarSinhaOfficial 3 месяца назад

Java Script and Type Script are almost same... In JS you write "let a = 4" and in TS you write "let a: number = 4" So don't confuse... If you want to learn, go for it. You will need only 5-10 days to learn TS if you know JS

@adityacholkar1421 3 месяца назад

Good explanation, btw you are referring git graph as git lens throughout the entire series.

@HiteshChoudharydotcom 3 месяца назад

Oopps Stuff happens 😂

@not_amanullah 3 месяца назад

thanks ❤

@codevalley9511 3 месяца назад

Make a short video about git clean error also

@ankitkashyap2005 2 месяца назад

❤❤

@satyam_code 7 дней назад

♥♥

@patelronak153 2 месяца назад

❤🚀🏹

@arbazalam9798 3 месяца назад

❤

@yashtanwar1810 3 месяца назад

Green Screen Magic ✨

@ravishbisht502 3 месяца назад

Meri branch to merge hi nhi hui terminal atak gya vs code ka. Exit hi nhi hua mene sab uda dia phir 😊

@parthh1112 3 месяца назад

I'm struggling to grasp React.js concepts. I find myself stuck in a cycle of watching tutorials and mindlessly copying code. When attempting my own projects, I'm at a loss for where to begin. How can I break this pattern and truly understand React? Any guidance would be greatly appreciated.

@samareshshil69 3 месяца назад

Firstly look at everything on a web page as a component , that can be a button as well. And all the small tiny components make a web page with the unidirectional data flow form top to the bottom. And to escape from this complicated data flow we use state management library, mostly Redux. What makes react so beautiful is its virtual dom . Any simple state change in a component or passing a props i.e a custom property to the components web page renders and re renders . And renders only that small part not the whole page.That is where SPA comes into play. Learn about React router through which we can travel through different web pages. Components can be structured in two ways.. class and function. Although class components are getting deprecated but not yet obsolete. With the help of different hooks from react library we can perform all the work of class components in function components.

@parthh1112 3 месяца назад

Thank you for providing me with guidance on how to approach project thinking. I appreciate the insight, and I am eager to commence work on it promptly.@@samareshshil69

@itsallaboutislam9504 3 месяца назад

Learn one topic then understand why it is important and do 2 to 3 examples and be comfortable with that, In start it takes time but trust me after sometime you extract quality knowledge from every topic Hope you understand well❤ ❤❤