Git Merge Conflicts | How Merge Conflicts Happen | How to resolve Merge Conflicts | Merge Conflict
ฝัง
- เผยแพร่เมื่อ 4 ต.ค. 2024
- DevOps Online Training Registration form: bit.ly/valaxy-...
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/udemysh...
DevOps Workshop-2 ► bit.ly/udemyde...
DevOps Project-1 ► bit.ly/udemyde...
Kubernetes microservices ► bit.ly/udemykube
Linux for DevOps ► bit.ly/udemyvinux
Git for DevOps ► bit.ly/udemygi...
Ansible for DevOps Beginners ► bit.ly/udemyan...
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/ValaxyA...
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...
#Devops #Valaxy #AWS
![[UNCUT] “บอสณวัฒน์” ลากไส้!! ใครหนุนหลัง "แม่ตั๊ก ป๋าเบียร์" I คนดังนั่งเคลียร์ I 30 ก.ย. 67](http://i.ytimg.com/vi/QlD7mU2KKRk/mqdefault.jpg)
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.
Thank you for the vid, better explanation than all the flashy channels with million subscribers. Just straight to the point, detailed info. Perfect!
Couldn't be better explained! Thank you so much for such a good demonstration!
You explained it way better than those cloud academy trainings, thank you!
Thank you Sir, now got the clear understanding of merging conflicts
Thank you for the feedback
Excellent tutorial. Helped me tremendously with my school assignment.
Glad it helped!
i never saw this kind of explanation .Excellent video
You explained it nicely. Thank you so much.
I'm learning Git version control and this video really helped me understand merge conflict in detail! Thanks for the effort :)
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
glad that it helped you
one of the best explanation out there
No words to appreciate its very clear...
By this video i cleared how does git merge works really easy... Thanks
Thanks brother, I was having some doubts in this now i got cleared! thanks again!
Thank you so much! I was struggling with this concept but now it is all clear. great work
thanks you dude! super explaind!
Nice. What I'm exactly looking for.
Glad I could help
short and simple explanation
very neat and clear explanation
Glad you liked it
Well explained... many thanks for this amazing tutorial
You are welcome!
thank you so much, so smooth to understand
You're very welcome!
In real time what are the branches' names will be?
Master :
feature:
what are the names for these in real-time.
Awesome clear simple explained
thank you sir for making such helpful video .......
keep making such videos ..... :)
Thanks for Valuable Information Brother ☺️😌
You really explained this concept 👏👏👏
This was amazingly helpful, thank you.
I learned basics thank you very much
demo is very good to understand instead reading lines ... good one ..thanks
I subscribed instantly after 2 min of this video! Thanks for the great content & sharing your knowledge!💯
Awesome, thank you!
Brilliant way to explain!!
Thankyou so much!!! This helped me 😀😀😀
Glad it helped!
Best clear video.
very useful tutorial, thanks a lot
Glad it was helpful!
Thank you for the video!
Glad it was helpful!
Nicely Covered the concept.. Thank u..
Clearly Explained. Thank you!!
thank you. keep watching
Great Explaination
That's some nice content there....
Nicely explained 👍
Helps a lot, Thank you
It helped me a lot
fantastic tutorial
thank you
Absolutlely simple to folow and well understood , thanks Valaxy
Detailed information...thanks
Thanks very much bro
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?
Thanks
nice explanation.👌
very nice video
Well explained 👍
Glad you liked it
yes its clear explaination
thank you
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
Thanks a million:)
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”.
Well explained, looks like you didnt perform git merge --continue, should we run it or not?
I believe it did merge, when it added notes
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
Nicely explained clean and neat 💞
Super anna
Hi Sir Thanks for sharing this but can u please let us know about tools that u mentioned to use for large code?
you can use visual studio code, or any other popular IDE, most of them have support for most of the git features
sir, requesting a video on how to create AWS EC-2 Instance using ansible-playbook
Thanks bro
Hi sir one dought if we didn't pull the code then we didn't get the merge conflict ?
Thanks man
You're welcome!
what is the software used for that EC2 instance.
@sammed, I didnt get your question
great!
thanks
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
in this case both developers should discuss and decide which code shod go into repo.
Sir do you have special course for Git admin and Jenkins admin?
We have separate course for git admin. Check out in courses.valaxy.in
fantastic
Thank you so much ...
What if there were hundreds of files that have conflicts? You can't resolve one at a time right?
Yes, you can able to find any number of files. its all about commits right.
nice job
Thanks!
sir, requsting you to explain git submodules inside a repository...to clone a sub folder acting like a repo.. thanks in advance..
bookmark: 9:40
you are explaining...but first explains the concept in a diagram then in code. do not mix it
Kuch nahi samjla
speak English
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