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

  • @mahmoudelwan4337
    @mahmoudelwan433711 күн бұрын

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

  • @abuanfaal381
    @abuanfaal38117 күн бұрын

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

  • @sumedhux
    @sumedhux2 ай бұрын

    Thanks for the series definitely watch and share this for sure

  • @ravigrover1923
    @ravigrover19232 ай бұрын

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

  • @debabratabar2008
    @debabratabar200829 күн бұрын

    The best indepth video on git internal working in whole youtube

  • @ankushladani496
    @ankushladani4962 ай бұрын

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

  • @soniyaprasad77
    @soniyaprasad772 ай бұрын

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

  • @fasty703
    @fasty70328 күн бұрын

    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
    @vishwanatha68592 ай бұрын

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

  • @sivasai6890
    @sivasai68902 ай бұрын

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

  • @NeedToKnow.
    @NeedToKnow.25 күн бұрын

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

  • @sarth8065
    @sarth80652 ай бұрын

    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!

  • @chhavimanichoubey9437
    @chhavimanichoubey94372 ай бұрын

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

  • @anandstephan6020
    @anandstephan60202 ай бұрын

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

  • @RandomRaju-zb8vf
    @RandomRaju-zb8vf2 ай бұрын

    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 🙏🙏🙏🙏

  • @amarnatha1614
    @amarnatha16142 ай бұрын

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

  • @MathsWithSatyamPandey
    @MathsWithSatyamPandey2 ай бұрын

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

  • @ANEEQAHMED-in6nz
    @ANEEQAHMED-in6nz2 ай бұрын

    Thankyou for whole Git series

  • @user-hx1mx5vu5t
    @user-hx1mx5vu5t2 ай бұрын

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

  • @2amCoder
    @2amCoder2 ай бұрын

    this was absolutely crazy ! HATS OFF TO YOU SIR!

  • @bhavyakantawala19
    @bhavyakantawala192 ай бұрын

    This is such an awesome series!!

  • @Najir.Social
    @Najir.SocialАй бұрын

    Regular viewer from chai aur code channel ❤

  • @ExploreSciFi

    @ExploreSciFi

    Ай бұрын

    me too ♥ ♥

  • @anubhavseet004
    @anubhavseet00419 күн бұрын

    Hello Sir really enjoying your git series.

  • @yogeshkamble1500
    @yogeshkamble1500Ай бұрын

    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

  • @adityacholkar1421
    @adityacholkar14212 ай бұрын

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

  • @HiteshChoudharydotcom

    @HiteshChoudharydotcom

    2 ай бұрын

    Oopps Stuff happens 😂

  • @abhijitpradhan7860
    @abhijitpradhan78602 ай бұрын

    thank you sir ji for this type of content

  • @AmanKumar-cu5qs
    @AmanKumar-cu5qs2 ай бұрын

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

  • @tanvirahammadjoy
    @tanvirahammadjoy2 ай бұрын

    Thank you so much 😊 ❤sir for everything…

  • @codevalley9511
    @codevalley95112 ай бұрын

    Thank you very much

  • @_Hero_24
    @_Hero_242 ай бұрын

    so much informative lecture

  • @RohitChhabirajYadav
    @RohitChhabirajYadav2 ай бұрын

    Thank you sir

  • @DeviKumavath
    @DeviKumavathАй бұрын

    thank you

  • @MoroNjie
    @MoroNjie2 ай бұрын

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

  • @amitkr_15
    @amitkr_152 ай бұрын

    understand the conflicts 😀😀

  • @not_amanullah
    @not_amanullah2 ай бұрын

    thanks ❤

  • @codevalley9511
    @codevalley95112 ай бұрын

    Make a short video about git clean error also

  • @bishal.dangol
    @bishal.dangol2 ай бұрын

    github or gitlab, which is best for a student?

  • @vikassahani2874
    @vikassahani28742 ай бұрын

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

  • @user-hr5ub3yi3l
    @user-hr5ub3yi3lАй бұрын

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

  • @yashtanwar1810
    @yashtanwar18102 ай бұрын

    Green Screen Magic ✨

  • @ankitkashyap2005
    @ankitkashyap2005Ай бұрын

    ❤❤

  • @ravindraghawade8513
    @ravindraghawade85132 ай бұрын

    I know git but still watching it because you have covered such small point it made me confused that i really know the git?😅

  • @arbazalam9798
    @arbazalam97982 ай бұрын

  • @bilal.mansuri
    @bilal.mansuri2 ай бұрын

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

  • @AmanKumarSinhaOfficial

    @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

  • @AmanKumarSinhaOfficial
    @AmanKumarSinhaOfficial2 ай бұрын

    Next series on React Native

  • @knowjesusandproclaimjesus

    @knowjesusandproclaimjesus

    2 ай бұрын

    Yes please 🙏

  • @ExploreSciFi

    @ExploreSciFi

    Ай бұрын

    oN chai aur code channel 🎄 🎄

  • @patelronak153
    @patelronak153Ай бұрын

    ❤🚀🏹

  • @viraljain9197
    @viraljain9197Ай бұрын

    5th checkpoint on 20may

  • @raj-umang
    @raj-umangАй бұрын

    👌👌👌👌👌👌👌👌👌👌👌👌👌👌

  • @parthh1112
    @parthh11122 ай бұрын

    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

    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

    @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

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

  • @ravishbisht502
    @ravishbisht5022 ай бұрын

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

  • @abhijitpradhan7860
    @abhijitpradhan78602 ай бұрын

    😇😇😇😇😇

  • @RohitChhabirajYadav
    @RohitChhabirajYadav2 ай бұрын

    #git

  • @vivekguptacs
    @vivekguptacs27 күн бұрын

    If you just came here for see how conflict resolve. Just check last 2 min. 😀

  • @coolwithsaquibaquib
    @coolwithsaquibaquib2 ай бұрын

    Day 5 present

  • @RohitChhabirajYadav
    @RohitChhabirajYadav2 ай бұрын

    #gitseries

  • @kevinpatel123
    @kevinpatel1232 ай бұрын

    chai aur code praja attendance lagao comment karke😌

  • @arbazalam9798
    @arbazalam97982 ай бұрын

    Comment💬 kr do bhai😢❤

  • @wiseduckofficials
    @wiseduckofficials2 ай бұрын

    git and github made easier