Resolving Merge Conflicts (With Example) | Git Tutorials #17

แชร์
ฝัง
  • เผยแพร่เมื่อ 7 พ.ย. 2024

ความคิดเห็น • 161

  • @piyushmathpal4244
    @piyushmathpal4244 4 ปีที่แล้ว +7

    Guys to be honest, I have watched tons of videos regarding this topic
    This is the best in all of them. Will definately refer to my contacts

  • @nishant_soni97
    @nishant_soni97 4 ปีที่แล้ว +16

    thanks brother may all your dreams come true....happy coading

  • @shahbazkhan-ek7hp
    @shahbazkhan-ek7hp ปีที่แล้ว +2

    watching it 3yrs after its upload.Thank you.

  • @Debugged_Gamer
    @Debugged_Gamer 4 ปีที่แล้ว +1

    Harry bhai is the best.....kahi kuch samajh na aye bas inki video dekh lo sab samajh a jayega :) He explains each and every detail.

  • @Believeharsh
    @Believeharsh ปีที่แล้ว +2

    I'm watching this video on the 19th of June 2023 but still these videos are still relevant,
    thank you so much harry bhai

  • @ahsanalikhan7731
    @ahsanalikhan7731 3 ปีที่แล้ว +37

    49)To check all branches with their last commit hash code and message
    $ git branch -v
    50)To check which branch are merged
    $ git branch --merged
    51)To check which branch are not merged
    $ git branch --no-merged
    52)To delete branch
    $ git branch -d
    53)TO delete unmerged branch
    $ git branch -D

    • @mehdihasan8868
      @mehdihasan8868 3 ปีที่แล้ว +1

      Can you please share your git commands notes with me.

    • @ahsanalikhan7731
      @ahsanalikhan7731 3 ปีที่แล้ว +3

      @@mehdihasan8868 yeah , where should i send you notes ?

    • @navneet8638
      @navneet8638 2 ปีที่แล้ว +2

      @@ahsanalikhan7731 Bro can you please upload on your google drive and share the link with us 🙏🙏🙏

    • @sufiserious798
      @sufiserious798 2 ปีที่แล้ว +1

      You can also use $ git branch -D to delete even merged branches. So in short any branch can be deleted in one command with the $ git branch -D .

    • @SammuBumBumkiMumma
      @SammuBumBumkiMumma 2 ปีที่แล้ว +1

      hi , i am having branch which is not merged but my pr is open.
      and I have taken pull from the master which gives me lot of conflicts, now I just want to be back at my previous condition before taking pull. I am giving command git reset --hard HEAD it gives me error . please help

  • @mrnobody7451
    @mrnobody7451 5 ปีที่แล้ว +11

    Skills up to Date... thanks for making tutorials on it..😍😍😍

  • @shiv366
    @shiv366 3 ปีที่แล้ว +6

    Thanks a lot.. I learnt a lot from this complete playlist.
    Thank you

  • @moonlightCR7
    @moonlightCR7 ปีที่แล้ว

    I have no words to thank you Harry bro. You're a lifesaver, I love you. ❤

  • @fareehaliaqat9627
    @fareehaliaqat9627 10 หลายเดือนก่อน +2

    u are just great bro

  • @AnkitVerma-ch5oi
    @AnkitVerma-ch5oi 3 ปีที่แล้ว +6

    undoubtedly best course! Thanks for the info brother. Your explanation is so simple, it really makes it easy to understand.

  • @souravsaini8334
    @souravsaini8334 4 ปีที่แล้ว

    ab tak jitni video dekhi playlist ki sab makhaan ki tarah samajh ayi hai .

  • @mkasachinbhaika
    @mkasachinbhaika ปีที่แล้ว

    sir apki playlist mast,gajab,sandar, kya kya kahu sir bata nahi sakta

  • @mohdalam4668
    @mohdalam4668 3 ปีที่แล้ว

    you are teaching in very easy way
    harry bhai Allah bless you

  • @prathameshkothawade1938
    @prathameshkothawade1938 ปีที่แล้ว

    very easy to learn git from this playlist

  • @roushankumar-pm6sn
    @roushankumar-pm6sn 5 ปีที่แล้ว

    Bhai app bahot acche se kuch bhi shikate ho thank you

  • @ece03abhisheksrivastava64
    @ece03abhisheksrivastava64 5 ปีที่แล้ว +1

    Sir thank u for ur geat tutorials , ye pahela aaisa channel hai youtube pe jisme hum comment kiye
    Apse 2 requests hain .
    1 . HTML pe ek series banad do
    2. market mein bahut si web/domain hosting sites hain , hum log kaun sa choose . hota kya hai ki pay karne ke baad pata chalta hai isse badhiya aur sasta web hosting humko mil skata tha.

  • @mr_weirdo
    @mr_weirdo 3 ปีที่แล้ว +1

    haal chall to sab mast hi rahege jab aapke jese teacher padha rahe ho

  • @sampaksasa3756
    @sampaksasa3756 4 ปีที่แล้ว +20

    respect from canada : )

    • @thatsme4932
      @thatsme4932 4 ปีที่แล้ว +3

      Jai hind

    • @shashishekhar----
      @shashishekhar---- ปีที่แล้ว

      All respect to Harry bhai from India too.

    • @BharatPatel-qw5ii
      @BharatPatel-qw5ii 9 หลายเดือนก่อน

      Bapuji kya kar rahe hai tere dp me.

  • @engineerbhai7642
    @engineerbhai7642 5 ปีที่แล้ว

    You are best coder in you tube.

  • @vivekmodi3165
    @vivekmodi3165 ปีที่แล้ว

    All git concepts are explained in simple terms.
    Kindly please make video about using the git without command and with vscode git extension like taking pull from another non master branch,merge branch etc
    Thank you.

  • @AashishKumar-vb3qb
    @AashishKumar-vb3qb 3 ปีที่แล้ว

    ruaa diya is video ne toh , khatam hi ni hone ko aari , but a good video to recall git

  • @DharmeshTechZone
    @DharmeshTechZone ปีที่แล้ว

    Sir your video is always easy to understand.thank you for sharing

  • @kartikgupta3028
    @kartikgupta3028 4 ปีที่แล้ว +5

    Thanks for the information provided.
    But i think that the below points are missing:
    Private repository
    Pull command
    Host your own git repo on server
    How to rollback to previous commits, etc
    How to collaborate actually on git with practicals?

    • @d_r_e_x_x
      @d_r_e_x_x 4 ปีที่แล้ว +5

      Abe jaake playlist dekh PURA

  • @tanishadixit_
    @tanishadixit_ 3 ปีที่แล้ว +1

    Harry bhai wins the heart everytime : )

  • @dhruvsinghal6451
    @dhruvsinghal6451 3 ปีที่แล้ว +3

    can you please make a video that shows contributing to a project that will be really helpful

  • @viveknigam6041
    @viveknigam6041 ปีที่แล้ว

    Thanks for this course , very easy n intresting

  • @HirvaMehta01
    @HirvaMehta01 3 ปีที่แล้ว

    best playlist on git

  • @Weeknder847
    @Weeknder847 2 ปีที่แล้ว

    you are the best harry....thanks brother dil se

  • @khushalmore7678
    @khushalmore7678 3 ปีที่แล้ว +5

    hi bro, your tutorial is awesome, my query is,
    as we have seen vscode provides such great tool to resolve merge conflict, is there same way in phpstorm ide?

  • @disneychannelstars3583
    @disneychannelstars3583 4 ปีที่แล้ว

    I am big fan of yours..sir plz make a live project on angular and mongodb

  • @ramswaroop5019
    @ramswaroop5019 ปีที่แล้ว +1

    This series really helpful

  • @pranavyadav2860
    @pranavyadav2860 2 ปีที่แล้ว +1

    Still loving❤️ it

  • @RavindraSingh-zg9eq
    @RavindraSingh-zg9eq 3 หลายเดือนก่อน

    amazing session loved it

  • @jayantraj4748
    @jayantraj4748 3 ปีที่แล้ว +1

    Thank you so much harry bhai

  • @bhaktipatil2939
    @bhaktipatil2939 ปีที่แล้ว

    Thanks for your video
    How to resolve if we have 100 conflicts?
    This was asked in interview

  • @atisamshah681
    @atisamshah681 4 ปีที่แล้ว

    Good way of teaching sir

  • @PANKAJKUMAR-fe8zn
    @PANKAJKUMAR-fe8zn 4 ปีที่แล้ว

    Thank you for this series Bhaiya...Maza aa gya after know the potential of git

  • @aamirsydney2180
    @aamirsydney2180 11 หลายเดือนก่อน

    Awesome👍👍 Complete Git Course 💪💪💯

    • @BharatPatel-qw5ii
      @BharatPatel-qw5ii 9 หลายเดือนก่อน

      Pura ho gaya git course aapka 🦾

  • @aryangarg6749
    @aryangarg6749 4 ปีที่แล้ว

    Great work Harry Bhai . I like ur content very much with full knowledge and good content.

  • @maaz1150
    @maaz1150 4 ปีที่แล้ว +2

    Hi Harry Bhai. I am facing some problem. Whenever I create new branch, it automatically gets merged to master branch and the changes I do in new branch automatically gets uploaded to master branch as well. How to resolve.

  • @amanbhadani8840
    @amanbhadani8840 2 ปีที่แล้ว

    Bas badhiya hi chal rha harry bhai bas github me push wala video me error aa gya.

  • @vivekchourasiya1875
    @vivekchourasiya1875 5 ปีที่แล้ว

    best git video on youtube, keep it up harry bhai

  • @shishirchaurasiya3435
    @shishirchaurasiya3435 3 ปีที่แล้ว

    harry bhai sabkuch badiya chalra h

  • @swathikumar3074
    @swathikumar3074 2 ปีที่แล้ว +1

    Everyone telling solving merge conflicts in merge commands but that wont work in real time please make a video to resolve merge conflicts which is raised in Pull Request raised in GIT

  • @rajkumarmaity1243
    @rajkumarmaity1243 8 หลายเดือนก่อน

    harry bahi, you are great !!

  • @DharmeshTechZone
    @DharmeshTechZone ปีที่แล้ว +1

    Sir can you please explain difference between merge ane rebase and when to use both of them

  • @kadambarijena
    @kadambarijena ปีที่แล้ว +1

    sir,can you explain git rebase & git stash.

  • @bikramgupta8261
    @bikramgupta8261 3 ปีที่แล้ว

    Thank You bhai your videos are awesome and it to easy to understand love u bro.
    Can U make a full video on Docker.

  • @rishabhranjansinha2858
    @rishabhranjansinha2858 2 ปีที่แล้ว +1

    devops ?

  • @avinashkumar8224
    @avinashkumar8224 2 ปีที่แล้ว

    Really you did a great job.

  • @Arbic_calligraphy65
    @Arbic_calligraphy65 10 หลายเดือนก่อน

    this a really awesome love you Harry bhai

  • @nothingwrong988
    @nothingwrong988 4 ปีที่แล้ว +1

    Your tutorials are very good buddy, keep it going.....

  • @yashdonaldo1719
    @yashdonaldo1719 ปีที่แล้ว

    Love from Pluto

  • @AbhaySingh-de1uq
    @AbhaySingh-de1uq 4 ปีที่แล้ว

    Bhaut Badhiya Harry

  • @fareehaliaqat9627
    @fareehaliaqat9627 10 หลายเดือนก่อน

    hats off harry bhai

  • @sarveshdevrukhakar
    @sarveshdevrukhakar ปีที่แล้ว

    Comment for Increasing comments.
    Git➕➕.
    Thank You so much Harry Bhai. ❣

  • @nsiddiqi7997
    @nsiddiqi7997 2 ปีที่แล้ว

    very practical and spot on

  • @NikhilHalbe-p7x
    @NikhilHalbe-p7x 3 หลายเดือนก่อน

    good video as always harry bhai

  • @iamdanyaal
    @iamdanyaal 3 ปีที่แล้ว +1

    Thank You Sir

  • @umeshtaily4602
    @umeshtaily4602 ปีที่แล้ว

    You are outstanding ❣️⚡

  • @englishsongsbyashish
    @englishsongsbyashish 2 ปีที่แล้ว

    thankyou sir for beautiful explanation

  • @peeyushbhatt4838
    @peeyushbhatt4838 2 ปีที่แล้ว

    First of all thanks for your videos, very helpful. Can you please make videos on apex language as well?

  • @sameepkaushik4583
    @sameepkaushik4583 3 ปีที่แล้ว

    what is pull request and fetch and difference in both

  • @syedzubair9624
    @syedzubair9624 3 ปีที่แล้ว

    bro Awesome, i pray ke apke subscribers aur apka channel khoob badhe Ameen!!

  • @krishna_raj9331
    @krishna_raj9331 ปีที่แล้ว

    Very much helpful

  • @shailendrakushwaha8635
    @shailendrakushwaha8635 5 ปีที่แล้ว +1

    Sir please continue the Android development course

  • @boogameplays8381
    @boogameplays8381 5 ปีที่แล้ว

    Sir javascript ki video bhi upload kray plz

  • @ahsanijaz3319
    @ahsanijaz3319 2 ปีที่แล้ว

    Really Amazing....

  • @surajsidar2294
    @surajsidar2294 ปีที่แล้ว

    Why git checkout master not restoring?

  • @karamjeetsinghpadam507
    @karamjeetsinghpadam507 4 ปีที่แล้ว

    fantastic explanation!!… Thanks you Harry!!

  • @harshyadav5323
    @harshyadav5323 8 หลายเดือนก่อน

    Awesome bro 😊

  • @Abdulqadir-vf4cv
    @Abdulqadir-vf4cv 5 ปีที่แล้ว

    Hello sir u r a very brilliant man sir

  • @motivationstatus5782
    @motivationstatus5782 2 ปีที่แล้ว

    amazing video sir ji

  • @saumitrasaxena8470
    @saumitrasaxena8470 3 ปีที่แล้ว

    super super !!! Hats off to you .

  • @ayushpathak2003
    @ayushpathak2003 4 ปีที่แล้ว +1

    U r awesome sirrr

  • @antu_saha
    @antu_saha 2 ปีที่แล้ว

    Hall call badiya hee bhi

  • @ShubhamLondhe-oy7rc
    @ShubhamLondhe-oy7rc ปีที่แล้ว

    nice series

  • @jhs003
    @jhs003 ปีที่แล้ว

    Faaaaaaaaantabulus course !!!!!!!!

  • @shubhamagarwal6231
    @shubhamagarwal6231 3 ปีที่แล้ว

    I am following this course from starting.
    i have a doubt that how to move to previous commits,
    suppose i have created a file called file1.txt which have some text in it and then i have commited it with "Initial Commit" ,,, now i add some text and again commit it as "added text to file1.txt" now the problem is how to move to initial commit and see that file1.txt which was commited as initial commit.
    do answer this question

  • @md.abdulaziz1520
    @md.abdulaziz1520 2 ปีที่แล้ว

    Thanks a lot.

  • @mr_weirdo
    @mr_weirdo 3 ปีที่แล้ว +1

    loved it bhaiya
    😍😍😍😍😍😍😍

  • @rahulnag9582
    @rahulnag9582 4 ปีที่แล้ว

    really v very informative and nice video,
    thanks a lot

  • @basitali2962
    @basitali2962 6 หลายเดือนก่อน

    I am watching in 2024 billion thanks for this video

  • @pr0senjitsikdar
    @pr0senjitsikdar ปีที่แล้ว

  • @productive5
    @productive5 3 ปีที่แล้ว

    I am near to learn complete git in 1 week...

  • @OasisFinder
    @OasisFinder 3 ปีที่แล้ว

    why he is getting two arrow above every folder?

  • @rashmiambedkar5143
    @rashmiambedkar5143 5 ปีที่แล้ว

    Typescript in one video please. If you could please create I would be so grateful.
    Would you mind creating new typescript
    :)

  • @deepakyadav-gp2oq
    @deepakyadav-gp2oq 2 ปีที่แล้ว

    Superb

  • @rahimulislamshowrav4814
    @rahimulislamshowrav4814 ปีที่แล้ว

    thank you

  • @Dipanshutripathi2407
    @Dipanshutripathi2407 ปีที่แล้ว

    how can we add folders in the github

  • @pranavdani3810
    @pranavdani3810 4 ปีที่แล้ว +1

    Thank you so much for this series]

  • @thetopperinfo
    @thetopperinfo 2 ปีที่แล้ว

    best course!

  • @Meshv_patel
    @Meshv_patel 3 ปีที่แล้ว +1

    harry bhai apka ms whiteboard share kar do if possible git wala

  • @mrnobody7451
    @mrnobody7451 5 ปีที่แล้ว

    If u can make tutuoials on mean stack complete guide .
    Please make it..

  • @vikashnagar2114
    @vikashnagar2114 2 ปีที่แล้ว

    thank YOU bhai

  • @salonirathi1158
    @salonirathi1158 3 ปีที่แล้ว

    Very nice video👏👏

  • @khushalmore7678
    @khushalmore7678 3 ปีที่แล้ว +1

    hi bro, suppose we don't have vscode editor, a specific file has lots of merge conflicts(eg total conflicts 21). i resolved 15 manually and i seem that i resolved all conflicts. so how can i get to know that still there are some merge conflicts remaining?

    • @sufiserious798
      @sufiserious798 2 ปีที่แล้ว +1

      Won't you come to know that in GitBash when you try merging those branches? If it displays conflict that means there are still conflicts to be resolved, otherwise it will display all conflicts are resolved but you are still merging.

  • @rajivdubey2206
    @rajivdubey2206 4 ปีที่แล้ว

    If i have merged master and issue1 and then i have deleted issue1 ,would there will be any change in master like it will unmerged or something like that??

  • @OneWayReality
    @OneWayReality 3 ปีที่แล้ว

    Bhaiya, agar situation esa ho ki master branch meh jo title tag hai usko change nhi kra aur issu1 branch ke sath merge kr rha hu toh yah kya abhi bhi merge conflict show karega???