Git merge and git conflicts
Ойын-сауық
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...
Пікірлер: 67
This might be the first tutorial I've seen that actually cares about concepts and general understanding instead of jumping into code and commands
The way you explain is amazing. Best git course I’ve come across on KZread! Appreciate it
Thanks for the series definitely watch and share this for sure
It helped me understand merge conflicts with greater clarity, Thanks again!
The best indepth video on git internal working in whole youtube
I finally got a clear idea about the merge conflict. Thanks...❤
I am happy happy after a clear understanding of branching, Thankyou :)
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
really helped a lot to understand the merge conflicts. Thank you !!
Nice going sir. Keep rocking with more series. Thanks a lot
The way you precisely explained this conflict topic is just unmatched.
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!
Some time ago I've started learning about merge conflicts and only today I get it because of this video.
thanks sir for the videos after this video i know the internal working of merging the branches.
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 🙏🙏🙏🙏
Sir, i appreciate your way of teaching...I really enjoyed it
आँखों मे नींद है सर और आप video create कर रहे है। आपके dedication को सलाम ❤ love you sir from chai aur code KZread channel 🙏
Thankyou for whole Git series
good series with packed knowledge thank you hitesh ji :)))
this was absolutely crazy ! HATS OFF TO YOU SIR!
This is such an awesome series!!
Regular viewer from chai aur code channel ❤
@ExploreSciFi
Ай бұрын
me too ♥ ♥
Hello Sir really enjoying your git series.
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
Good explanation, btw you are referring git graph as git lens throughout the entire series.
@HiteshChoudharydotcom
2 ай бұрын
Oopps Stuff happens 😂
thank you sir ji for this type of content
thanks for this video waiting for videos which cover push-pull conflict also and force merge/conflict too sir #chaiorcode #30thcomment
Thank you so much 😊 ❤sir for everything…
Thank you very much
so much informative lecture
Thank you sir
thank you
when do we use --ff-only and will you also be discussing about rebase?
understand the conflicts 😀😀
thanks ❤
Make a short video about git clean error also
github or gitlab, which is best for a student?
Should we use git & GitHub on Ms word & Ms Excel files?
wasnt able to figure out how to get that diagram via gitlens in the beginning
Green Screen Magic ✨
❤❤
I know git but still watching it because you have covered such small point it made me confused that i really know the git?😅
❤
Sir what is the right time to learn Typescript, after JS backend or before
@AmanKumarSinhaOfficial
2 ай бұрын
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
Next series on React Native
@knowjesusandproclaimjesus
2 ай бұрын
Yes please 🙏
@ExploreSciFi
Ай бұрын
oN chai aur code channel 🎄 🎄
❤🚀🏹
5th checkpoint on 20may
👌👌👌👌👌👌👌👌👌👌👌👌👌👌
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
2 ай бұрын
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
2 ай бұрын
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
Ай бұрын
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❤ ❤❤
Meri branch to merge hi nhi hui terminal atak gya vs code ka. Exit hi nhi hua mene sab uda dia phir 😊
😇😇😇😇😇
#git
If you just came here for see how conflict resolve. Just check last 2 min. 😀
Day 5 present
#gitseries
chai aur code praja attendance lagao comment karke😌
Comment💬 kr do bhai😢❤
git and github made easier