Git merge and git conflicts

  Рет қаралды 26,707

Hitesh Choudhary

Hitesh Choudhary

Күн бұрын

Пікірлер: 79
@TheCodeSideStories
@TheCodeSideStories 23 күн бұрын
This video was amazing . i was looking for an explaination like this since a long time . please make a playlist on aws and devops
@ravigrover1923
@ravigrover1923 9 ай бұрын
It helped me understand merge conflicts with greater clarity, Thanks again!
@sumedhux
@sumedhux 9 ай бұрын
Thanks for the series definitely watch and share this for sure
@mayankraicha4140
@mayankraicha4140 19 күн бұрын
Great explanation, this video helped me with all the fundamental concepts behind GIT. Thanks!
@laveenajethani8572
@laveenajethani8572 3 ай бұрын
It is too much informative and cleared by concepts for git merge command.
@abuanfaal381
@abuanfaal381 7 ай бұрын
The way you explain is amazing. Best git course I’ve come across on KZbin! Appreciate it
@ankushladani496
@ankushladani496 9 ай бұрын
I finally got a clear idea about the merge conflict. Thanks...❤
@powercircuitacademy
@powercircuitacademy 9 ай бұрын
आँखों मे नींद है सर और आप video create कर रहे है। आपके dedication को सलाम ❤ love you sir from chai aur code KZbin channel 🙏
@MuhammadBilal-fw7gh
@MuhammadBilal-fw7gh 2 ай бұрын
Thanks, Great explanation, cleared all the basic scenarios!
@fasty703
@fasty703 8 ай бұрын
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
@NeedToKnow.
@NeedToKnow. 7 ай бұрын
The way you precisely explained this conflict topic is just unmatched.
@mahmoudelwan4337
@mahmoudelwan4337 7 ай бұрын
This might be the first tutorial I've seen that actually cares about concepts and general understanding instead of jumping into code and commands
@sarth8065
@sarth8065 9 ай бұрын
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!
@basitbaig
@basitbaig Ай бұрын
nice explanation, simple and easy to understand. Thank you
@chhavimanichoubey9437
@chhavimanichoubey9437 9 ай бұрын
Some time ago I've started learning about merge conflicts and only today I get it because of this video.
@sivasai6890
@sivasai6890 9 ай бұрын
Nice going sir. Keep rocking with more series. Thanks a lot
@debabratabar2008
@debabratabar2008 8 ай бұрын
The best indepth video on git internal working in whole youtube
@soniyaprasad77
@soniyaprasad77 9 ай бұрын
I am happy happy after a clear understanding of branching, Thankyou :)
@gangadharam_yadav
@gangadharam_yadav 4 ай бұрын
I learned a lot from your video bro, thank you so much 🙏🙏🙏🙏
@TheUnknown-kz9ur
@TheUnknown-kz9ur 4 ай бұрын
Thanks for this series ,Hitesh
@anandstephan6020
@anandstephan6020 9 ай бұрын
thanks sir for the videos after this video i know the internal working of merging the branches.
@Najir.Social
@Najir.Social 8 ай бұрын
Regular viewer from chai aur code channel ❤
@ExploreSciFi
@ExploreSciFi 8 ай бұрын
me too ♥ ♥
@hassije8615
@hassije8615 3 ай бұрын
Hello Sir, could you tell us which shell you use, it sounds so good!
@RandomRaju-zb8vf
@RandomRaju-zb8vf 9 ай бұрын
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 🙏🙏🙏🙏
@ANEEQAHMED-in6nz
@ANEEQAHMED-in6nz 9 ай бұрын
Thankyou for whole Git series
@amarnatha1614
@amarnatha1614 9 ай бұрын
Sir, i appreciate your way of teaching...I really enjoyed it
@adityacholkar1421
@adityacholkar1421 9 ай бұрын
Good explanation, btw you are referring git graph as git lens throughout the entire series.
@HiteshCodeLab
@HiteshCodeLab 9 ай бұрын
Oopps Stuff happens 😂
@2amCoder
@2amCoder 9 ай бұрын
this was absolutely crazy ! HATS OFF TO YOU SIR!
@vishwanatha6859
@vishwanatha6859 9 ай бұрын
really helped a lot to understand the merge conflicts. Thank you !!
@yogeshkamble1500
@yogeshkamble1500 8 ай бұрын
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
@bhavyakantawala19
@bhavyakantawala19 9 ай бұрын
This is such an awesome series!!
@anubhavseet004
@anubhavseet004 7 ай бұрын
Hello Sir really enjoying your git series.
@aastikofficial6100
@aastikofficial6100 6 ай бұрын
26:40 its a pretty dangerous option thats why -d oh hitesh sir rock😂 ❤
@MoroNjie
@MoroNjie 9 ай бұрын
when do we use --ff-only and will you also be discussing about rebase?
@parthh1112
@parthh1112 9 ай бұрын
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
@samareshshil69 9 ай бұрын
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
@parthh1112 9 ай бұрын
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
@Bbchello
@Bbchello 8 ай бұрын
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❤ ❤❤
@charishmayerra2531
@charishmayerra2531 6 ай бұрын
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.
@GeetanjaliKarma-x6h
@GeetanjaliKarma-x6h 4 ай бұрын
Thank you!
@AmanKumar-cu5qs
@AmanKumar-cu5qs 9 ай бұрын
thanks for this video waiting for videos which cover push-pull conflict also and force merge/conflict too sir #chaiorcode #30thcomment
@awaizdottech
@awaizdottech 8 ай бұрын
wasnt able to figure out how to get that diagram via gitlens in the beginning
@bishal.dangol
@bishal.dangol 9 ай бұрын
github or gitlab, which is best for a student?
@tanvirahammadjoy
@tanvirahammadjoy 9 ай бұрын
Thank you so much 😊 ❤sir for everything…
@abhijitpradhan7860
@abhijitpradhan7860 9 ай бұрын
thank you sir ji for this type of content
@satyam_code
@satyam_code 6 ай бұрын
♥♥
@vikassahani2874
@vikassahani2874 9 ай бұрын
Should we use git & GitHub on Ms word & Ms Excel files?
@amitkr_15
@amitkr_15 9 ай бұрын
understand the conflicts 😀😀
@_Hero_24
@_Hero_24 9 ай бұрын
so much informative lecture
@raj-umang
@raj-umang 8 ай бұрын
👌👌👌👌👌👌👌👌👌👌👌👌👌👌
@AmanKumarSinhaOfficial
@AmanKumarSinhaOfficial 9 ай бұрын
Next series on React Native
@knowjesusandproclaimjesus
@knowjesusandproclaimjesus 9 ай бұрын
Yes please 🙏
@ExploreSciFi
@ExploreSciFi 8 ай бұрын
oN chai aur code channel 🎄 🎄
@vedanth9419
@vedanth9419 5 ай бұрын
Really enjoyed sir
@codevalley9511
@codevalley9511 9 ай бұрын
Thank you very much
@LeflxLight
@LeflxLight 5 ай бұрын
It is an amazing lecture.
@giteshghure212
@giteshghure212 5 ай бұрын
Thanks you so much
@RohitChhabirajYadav
@RohitChhabirajYadav 9 ай бұрын
Thank you sir
@codevalley9511
@codevalley9511 9 ай бұрын
Make a short video about git clean error also
@DeviKumavath
@DeviKumavath 8 ай бұрын
thank you
@not_amanullah
@not_amanullah 9 ай бұрын
thanks ❤
@yashtanwar1810
@yashtanwar1810 9 ай бұрын
Green Screen Magic ✨
@ankitkashyap2005
@ankitkashyap2005 8 ай бұрын
❤❤
@ravishbisht502
@ravishbisht502 9 ай бұрын
Meri branch to merge hi nhi hui terminal atak gya vs code ka. Exit hi nhi hua mene sab uda dia phir 😊
@kevinpatel123
@kevinpatel123 9 ай бұрын
chai aur code praja attendance lagao comment karke😌
@vivekguptacs
@vivekguptacs 7 ай бұрын
If you just came here for see how conflict resolve. Just check last 2 min. 😀
@abhijitpradhan7860
@abhijitpradhan7860 9 ай бұрын
😇😇😇😇😇
@patelronak153
@patelronak153 8 ай бұрын
❤🚀🏹
@Xcoder__1957
@Xcoder__1957 9 ай бұрын
@ravindraghawade8513
@ravindraghawade8513 9 ай бұрын
I know git but still watching it because you have covered such small point it made me confused that i really know the git?😅
@viraljain9197
@viraljain9197 8 ай бұрын
5th checkpoint on 20may
@RohitChhabirajYadav
@RohitChhabirajYadav 9 ай бұрын
#git
@coolwithsaquibaquib
@coolwithsaquibaquib 9 ай бұрын
Day 5 present
@RohitChhabirajYadav
@RohitChhabirajYadav 9 ай бұрын
#gitseries
@Xcoder__1957
@Xcoder__1957 9 ай бұрын
Comment💬 kr do bhai😢❤
@wiseduckofficials
@wiseduckofficials 9 ай бұрын
git and github made easier
Git Diff and stashing
28:23
Hitesh Choudhary
Рет қаралды 18 М.
Git rebase is not that scary
21:44
Hitesh Choudhary
Рет қаралды 27 М.
Правильный подход к детям
00:18
Beatrise
Рет қаралды 11 МЛН
How Strong Is Tape?
00:24
Stokes Twins
Рет қаралды 96 МЛН
Git Branching and Merging - Detailed Tutorial
54:28
SuperSimpleDev
Рет қаралды 235 М.
Insight of pushing code to Github
40:58
Hitesh Choudhary
Рет қаралды 18 М.
Zed Text Editor. A VSCode alternative?
15:51
Infralovers GmbH
Рет қаралды 10 М.
Resolve Git MERGE CONFLICTS: The Definitive Guide
8:02
The Modern Coder
Рет қаралды 55 М.
Git commits and logs
16:36
Hitesh Choudhary
Рет қаралды 20 М.
Git MERGE vs REBASE: The Definitive Guide
9:39
The Modern Coder
Рет қаралды 137 М.
How GitHub's Database Self-Destructed in 43 Seconds
12:04
Kevin Fang
Рет қаралды 1 МЛН
The EXTREMELY helpful guide to merge conflicts
8:22
Visual Studio Code
Рет қаралды 140 М.
Правильный подход к детям
00:18
Beatrise
Рет қаралды 11 МЛН