Git Error-You have divergent branches and need to specify how to reconcile them | Git Merge Conflict

preview_player
Показать описание
Hi Learners,
Most of the time while working with local & remote branches in git, you might have come across this error while trying to push to the remote(Github) or while pulling from the remote(Github): "You have divergent branches and need to specify how to reconcile them."

In this video, I've demonstrated How I got this error, What are the best practices we should follow while working with Git, and How I resolved this error.

Hope, it'll be helpful :)

Do let me know in the comments if you've any queries
And feel free to drop a suggestion on what topics I should make my next videos!

Thank you :)
Рекомендации по теме
Комментарии
Автор

I wish I could give you a hug, thank you very much!

BrunoVinicius-ixwt
Автор

thank you bb, you fixed my problem, i will never use --amend ever again, this is how i got my problem in the first place LOL

BizzaroBrainBoi
Автор

THANK YOU MAAM
pls bring more such videos.. this is a life saviour..
you are the only one.

inspired_enough_to_grow_up
Автор

Great video Sakshi, thanks a lot! I've been told to use rebase in this scenario before, but never quite understood how it worked until watching this

TomAinsworth-xm
Автор

Almost got the same issue & now it's resolved. Thanks for this video.

SureshKumarMajhi
Автор

Great video Sakshi. Straight forward explanation and an article to follow through. Keep it up!

codewithnacho
Автор

It was very helpful thanku.. u saved a lot of time. After using that rebase command i found out that i am not authorised to merge lol.. thats another issue but i got the solution because of you

SmritiBhagat
Автор

Thanks Sakshi ! I found it really helpful. 😄

Niamudeen
Автор

Thank you so much mam, this is a life saviour
Well explained!
I have successfully pushed and hosted my code
Subscribed right away

pranavmahendra
Автор

great explanation sakshi please make more videos and git error so that beginner like me can learn from u ..

varsharaj
Автор

Thank youso much for your Video it really worked :)

waakam
Автор

Great mam you solved my issue.Thanks a lot....

abhishekugale
Автор

aree yaar itni see baat thi batao ...thank you didi.

royalsrivastava
Автор

Didi pura project hi gayab ho gaya local system se git ke readme reh gaye hai bas 2 mahine ki mehnat barabad 😢😢 ab shayad naukari bhi jayegi

rachitarya
Автор

Hi Sakshi! That was using Linux. Instead of linux, please, explain it with Windows.

MyTripRoads