Git Merge Conflicts | How Merge Conflicts Happen | How to resolve Merge Conflicts | Merge Conflict

Подписаться 106 тыс.

Просмотров 174 тыс.

50% 1

DevOps Online Training Registration form: bit.ly/valaxy-form
For Online training, connect us on WhatsApp at +91-9642858583
============ Online Trainings =========
Online Trainings:
DevOps Practitioner Training ► bit.ly/ValaxySMD
DevOps Internship Training ► bit.ly/ValaxyRPT
Interview Preparation Sessions ► bit.ly/ValaxyDIP
Azure DevSecOps Training ► bit.ly/ValaxyADP
CyberSecurity Training ► bit.ly/ValaxyCST
Mean Stack Web Development ► bit.ly/ValaxyMSWD
Python Complete Course ► bit.ly/ValaxyPC
Data Science Training ► bit.ly/ValaxyDSP
Linux Shell Scripting ► bit.ly/ValaxyLSS
Real-time DevOps Project ► bit.ly/ValaxyDRP
Azure Admin Training ► bit.ly/ValaxyAA
============ Udemy Courses =========
AR Shankar Udemy Courses ► bit.ly/udemyshankar
DevOps Workshop-2 ► bit.ly/udemydevopsws
DevOps Project-1 ► bit.ly/udemydevops
Kubernetes microservices ► bit.ly/udemykube
Linux for DevOps ► bit.ly/udemyvinux
Git for DevOps ► bit.ly/udemygithub
Ansible for DevOps Beginners ► bit.ly/udemyansible
Maven for DevOps ► bit.ly/udemymaven
============ Our Other Courses =========
Packages:
Valaxy Ultimate Plan ► bit.ly/ValaxyUP
DevOps AWS and Python ► bit.ly/ValaxyDAP
DevOps AWS and Shell Scripting ► bit.ly/ValaxyDAS
AWS Pack ► bit.ly/ValaxyAP
Other Courses:
DevOps Course ► bit.ly/ValaxyDCC
Azure Administration ► bit.ly/ValaxyAAD
Production Ready Project ► bit.ly/ValaxyPRP
Kuberentes Project ► bit.ly/ValaxyKP
AWS (Amazon Web Services) ► bit.ly/ValaxyAWS
Python Complete Course ► bit.ly/ValaxyPCC
Shell Scripting ► bit.ly/ValaxySS
AWS automation with Boto3 ► bit.ly/ValaxyAWSPythonBoto3
Docker & Kubernetes ► bit.ly/ValaxyDK
Ansible for the DevOps ► bit.ly/ValaxyAD
DevOps Diploma Program ► bit.ly/ValaxyDDP
Valaxy PPTs ► bit.ly/ValaxyPPT
============ Free resources =========
DevOps Resumes ► bit.ly/ValaxyDR
Azure DevOps Resumes ► bit.ly/ValaxyADPR
Tools to learn in DevOps ► • Which DevOps tools sho...
============ Connect with Us =========
Facebook ► bit.ly/devopsgang
Instagram ► bit.ly/valaxyinsta
LinkedIn ► bit.ly/valaxyln
Website ► www.valaxy.in/
► courses.valaxy.in/
#Devops #Valaxy #AWS

Наука

Опубликовано:

14 июн 2020

Ссылка:

Скачать:

Готовим ссылку...

Добавить в:

Мой плейлист

Посмотреть позже

Комментарии : 98

@subhankarghosh1233 Год назад

Exceptionally Clear. Being a developer I have sailed through many channels on the same topic. You just nailed it. Great work. Precise, to the point, clearly explained like a well written story. Thanks a lot and god bless you.

@bn3121 Год назад

Thank you for the vid, better explanation than all the flashy channels with million subscribers. Just straight to the point, detailed info. Perfect!

@parthasarathibarman9862 11 месяцев назад

Couldn't be better explained! Thank you so much for such a good demonstration!

@automateddude 9 месяцев назад

Thanks brother, I was having some doubts in this now i got cleared! thanks again!

@amsyar_nz Месяц назад

thank you so much, I had a hard time understanding the conflict marker because the project I am doing rn has so many changes. Great video

@ValaxyTechnologies Месяц назад

glad that it helped you

@narangfamily7668 Год назад

Thank you so much! I was struggling with this concept but now it is all clear. great work

@shrutichavan4598 2 года назад

You explained it way better than those cloud academy trainings, thank you!

@africnona6521 9 месяцев назад

This was amazingly helpful, thank you.

@vishwasreddy100 4 года назад

I'm learning Git version control and this video really helped me understand merge conflict in detail! Thanks for the effort :)

@Vishal-wr6cc 4 года назад

Nicely Covered the concept.. Thank u..

@dhakshanapandi5816 Год назад

i never saw this kind of explanation .Excellent video

@manikandanarivazhagan5963 Год назад

No words to appreciate its very clear...

@sahuji5874 Год назад

That's some nice content there.... Nicely explained 👍

@dibbyo456 10 месяцев назад

You explained it nicely. Thank you so much.

@prasannadeshpande4435 Месяц назад

Thank you for the video!

@ValaxyTechnologies Месяц назад

Glad it was helpful!

@amarlukade2225 3 года назад

demo is very good to understand instead reading lines ... good one ..thanks

@chaitanyadeshmukh7049 3 года назад

thank you sir for making such helpful video ....... keep making such videos ..... :)

@MajdyCalisthenics 2 года назад

thanks you dude! super explaind!

@jigyasugautam6061 2 года назад

I learned basics thank you very much

@francisogbogu6109 Год назад

You really explained this concept 👏👏👏

@IndukuriMaheswarReddy 10 месяцев назад

Helps a lot, Thank you

@AvAnilkumarVaddi Год назад

Thanks for Valuable Information Brother ☺️😌

@thebhargavraval Год назад

Thank you for simplified explanation. So Developer1 updated the file and fixed conflicts in master branch directly. What about his dev1branch? It still has conflicts, right?

@sidb2023 2 года назад

After removing conflicts, we did not use merge command. Do we need to use merge command after removing the conflict or directly push the code from master to remote repository

@ajinsam Год назад

one of the best explanation out there

@chandugopu6196 3 года назад

Detailed information...thanks

@prakashkumarbhanja6270 2 года назад

By this video i cleared how does git merge works really easy... Thanks

@ShoumikChowdhuryTheBest Год назад

Brilliant way to explain!!

@cleargolam 8 месяцев назад

Best clear video.

@Arya20012 Месяц назад

thank you so much, so smooth to understand

@ValaxyTechnologies Месяц назад

You're very welcome!

@shreyasb.s3819 Год назад

Awesome clear simple explained

@KiranKumar-sb3ti 6 месяцев назад

Thanks very much bro

@rohanmedpalwar9531 Год назад

It helped me a lot

@Anup_x 10 месяцев назад

Nice. What I'm exactly looking for.

@ValaxyTechnologies 10 месяцев назад

Glad I could help

@freud6343 3 года назад

Clearly Explained. Thank you!!

@ValaxyTechnologies 3 года назад

thank you. keep watching

@biswajitmishra3461 6 месяцев назад

fantastic tutorial

@prabhatsingh7839 2 года назад

Well explained... many thanks for this amazing tutorial

@ValaxyTechnologies 2 года назад

You are welcome!

@srinivas.gunnabathula 3 года назад

In real time what are the branches' names will be? Master : feature: what are the names for these in real-time.

@jaren_c 10 месяцев назад

Excellent tutorial. Helped me tremendously with my school assignment.

@ValaxyTechnologies 10 месяцев назад

Glad it helped!

@georgiabrown2267 9 месяцев назад

You mentioned changes cannot be made on master branch so why did developer 2 made the changes on the master rather than creating a new branch

@ManojKumar-mt7fs 3 года назад

Hi sir one dought if we didn't pull the code then we didn't get the merge conflict ?

@nnamdiodozi7713 9 месяцев назад

Would using git rebase instead of git merge have worked first time? Also I would have thought git merge with no fast forward would automatically strip out “my name is developer 2” and replace with “my name is developer 1” and also replace “I am from Delhi” with “I am from Bangalore”.

@psychology5456 9 месяцев назад

Thanks bro

@reshmabhaskar8097 11 месяцев назад

I subscribed instantly after 2 min of this video! Thanks for the great content & sharing your knowledge!💯

@ValaxyTechnologies 10 месяцев назад

Awesome, thank you!

@bhupellygopikrishna3039 Год назад

Great Explaination

@talipoglu1836 Месяц назад

very useful tutorial, thanks a lot

@ValaxyTechnologies Месяц назад

Glad it was helpful!

@prashantkesharwani9205 Год назад

Thanks a million:)

@shravanisonu3605 2 года назад

Thankyou so much!!! This helped me 😀😀😀

@ValaxyTechnologies 2 года назад

Glad it helped!

@user-ry2fj3vi7b 28 дней назад

very neat and clear explanation

@ValaxyTechnologies 27 дней назад

Glad you liked it

@masoomsanadi Год назад

short and simple explanation

@Trip2See Год назад

very nice video

@vinayy4987 Год назад

nice explanation.👌

@pigeon1996 2 года назад

Super anna

@ulquiorra3504 Год назад

Absolutlely simple to folow and well understood , thanks Valaxy

@mehdimajdi8665 Месяц назад

Thanks man

@ValaxyTechnologies Месяц назад

You're welcome!

@gowtham4383 Год назад

Thanks

@sandhya810 2 года назад

Hi Sir Thanks for sharing this but can u please let us know about tools that u mentioned to use for large code?

@adityagitte Год назад

you can use visual studio code, or any other popular IDE, most of them have support for most of the git features

@nikhilahiremath758 Год назад

thank you

@krishnakanthreddybhimavarapu 4 года назад

sir, requesting a video on how to create AWS EC-2 Instance using ansible-playbook

@chhumchanleak7642 2 месяца назад

nice job

@ValaxyTechnologies 2 месяца назад

Thanks!

@yadav__jitender 3 года назад

Well explained 👍

@ValaxyTechnologies 3 года назад

Glad you liked it

@empowerpeoplebytech2347 3 года назад

great!

@ValaxyTechnologies 3 года назад

thanks

@ankitdubey9310 10 месяцев назад

But then this should always be the case if i try to modify some lines in the existing code , for example when dev 2 was pushing the change how are we sure that his change is the one that should be merged

@ValaxyTechnologies 10 месяцев назад

in this case both developers should discuss and decide which code shod go into repo.

@sammedsankonatti9642 2 года назад

what is the software used for that EC2 instance.

@ValaxyTechnologies 2 года назад

@sammed, I didnt get your question

@lividfont8714 2 года назад

What if there were hundreds of files that have conflicts? You can't resolve one at a time right?

@ValaxyTechnologies 2 года назад

Yes, you can able to find any number of files. its all about commits right.

@SunilKumar-hu3ow Год назад

Nicely explained clean and neat 💞

@vinayak4739 3 года назад

fantastic

@ValaxyTechnologies 3 года назад

Thank you so much ...

@aakashsonkusare69 2 года назад

Sir do you have special course for Git admin and Jenkins admin?

@ValaxyTechnologies 2 года назад

We have separate course for git admin. Check out in courses.valaxy.in

@karthikjmoger478 2 года назад

Well explained, looks like you didnt perform git merge --continue, should we run it or not?

@maclanphere5674 2 года назад

I believe it did merge, when it added notes

@krishnakanthreddybhimavarapu 4 года назад

sir, requsting you to explain git submodules inside a repository...to clone a sub folder acting like a repo.. thanks in advance..

@nikhil199029 2 года назад

bookmark: 9:40

@soumyadev100 Год назад

you are explaining...but first explains the concept in a diagram then in code. do not mix it

@Lifeinmumbai746 6 месяцев назад

Kuch nahi samjla

@imposter4778 Год назад

Hello Sir we have 2 branch in gitlab main and development and the .gitlab-ci.yml is also different in both branch but when we merge it also replace the main branch .gitlab-ci.yml file with development how can we fix this