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

[@piyushmathpal4244]

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

[@ahsanalikhan7731]

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]

Can you please share your git commands notes with me.

[@ahsanalikhan7731]

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

[@navneet8638]

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

[@sufiserious798]

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]

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

[@shahbazkhan-ek7hp]

watching it 3yrs after its upload.Thank you.

[@Believeharsh]

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

[@nishant_soni97]

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

[@Debugged_Gamer]

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.

[@mrnobody7451]

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

[@shiv366]

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

[@moonlightCR7]

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

[@AnkitVerma-ch5oi]

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

[@ece03abhisheksrivastava64]

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.

[@mohdalam4668]

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

[@sampaksasa3756]

respect from canada : )

[@thatsme4932]

Jai hind

[@shashishekhar----]

All respect to Harry bhai from India too.

[@BharatPatel-qw5ii]

Bapuji kya kar rahe hai tere dp me.

[@souravsaini8334]

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

[@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.

[@kartikgupta3028]

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]

Abe jaake playlist dekh PURA

[@prathameshkothawade1938]

very easy to learn git from this playlist

[@fareehaliaqat9627]

u are just great bro

[@mkasachinbhaika]

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

[@dhruvsinghal6451]

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

[@roushankumar-pm6sn]

Bhai app bahot acche se kuch bhi shikate ho thank you

[@DharmeshTechZone]

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

[@mr_weirdo]

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

[@tanishadixit_]

Harry bhai wins the heart everytime : )

[@engineerbhai7642]

You are best coder in you tube.

[@viveknigam6041]

Thanks for this course , very easy n intresting

[@Weeknder847]

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

[@ramswaroop5019]

This series really helpful

[@HirvaMehta01]

best playlist on git

[@AashishKumar-vb3qb]

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

[@vivekchourasiya1875]

best git video on youtube, keep it up harry bhai

[@aryangarg6749]

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

[@PANKAJKUMAR-fe8zn]

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

[@pranavyadav2860]

Still loving❤️ it

[@jayantraj4748]

Thank you so much harry bhai

[@disneychannelstars3583]

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

[@atisamshah681]

Good way of teaching sir

[@RavindraSingh-zg9eq]

amazing session loved it

[@nothingwrong988]

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

[@syedzubair9624]

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

[@bikramgupta8261]

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

[@aamirsydney2180]

Awesome👍👍 Complete Git Course 💪💪💯

[@BharatPatel-qw5ii]

Pura ho gaya git course aapka 🦾

[@avinashkumar8224]

Really you did a great job.

[@swathikumar3074]

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

[@khushalmore7678]

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?

[@nsiddiqi7997]

very practical and spot on

[@shailendrakushwaha8635]

Sir please continue the Android development course

[@umeshtaily4602]

You are outstanding ❣️⚡

[@Arbic_calligraphy65]

this a really awesome love you Harry bhai

[@DharmeshTechZone]

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

[@shishirchaurasiya3435]

harry bhai sabkuch badiya chalra h

[@karamjeetsinghpadam507]

fantastic explanation!!… Thanks you Harry!!

[@iamdanyaal]

Thank You Sir

[@bhaktipatil2939]

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

[@englishsongsbyashish]

thankyou sir for beautiful explanation

[@amanbhadani8840]

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

[@peeyushbhatt4838]

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

[@AbhaySingh-de1uq]

Bhaut Badhiya Harry

[@rajkumarmaity1243]

harry bahi, you are great !!

[@sarveshdevrukhakar]

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

[@NikhilHalbe-p7x]

good video as always harry bhai

[@yashdonaldo1719]

Love from Pluto

[@fareehaliaqat9627]

hats off harry bhai

[@saumitrasaxena8470]

super super !!! Hats off to you .

[@kadambarijena]

sir,can you explain git rebase & git stash.

[@ayushpathak2003]

U r awesome sirrr

[@krishna_raj9331]

Very much helpful

[@ahsanijaz3319]

Really Amazing....

[@rahulnag9582]

really v very informative and nice video, thanks a lot

[@mr_weirdo]

loved it bhaiya 😍😍😍😍😍😍😍

[@jhs003]

Faaaaaaaaantabulus course !!!!!!!!

[@Abdulqadir-vf4cv]

Hello sir u r a very brilliant man sir

[@maaz1150]

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.

[@rashmiambedkar5143]

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

[@motivationstatus5782]

amazing video sir ji

[@pranavdani3810]

Thank you so much for this series]

[@mrnobody7451]

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

[@harshyadav5323]

Awesome bro 😊

[@pr0senjitsikdar]

[@ShubhamLondhe-oy7rc]

nice series

[@boogameplays8381]

Sir javascript ki video bhi upload kray plz

[@md.abdulaziz1520]

Thanks a lot.

[@antu_saha]

Hall call badiya hee bhi

[@thetopperinfo]

best course!

[@vikashnagar2114]

thank YOU bhai

[@deepakyadav-gp2oq]

Superb

[@rahimulislamshowrav4814]

thank you

[@aakashsingh604]

Love this channel

[@mahar_zeeshan]

Thanks harry bhaii

[@salonirathi1158]

Very nice video👏👏

[@bickyshaw9220]

Thanks

[@deepak6695]

Thanku

[@rishabhranjansinha2858]

devops ?

[@tanmaysingh8562]

Thanks! Harry

[@rajatchaurasia3578]

Present sir 😍😍😍♥️😍

[@basitali2962]

I am watching in 2024 billion thanks for this video

[@productive5]

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

[@SagarSagar-ym5wx]

nice sir

[@sameepkaushik4583]

what is pull request and fetch and difference in both

[@saranshsaxena207]

good, thanks