GIT in Tamil #6 | How to Resolve Git Merge Conflicts? | Git Tutorial

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

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

50% 1

This Video will help you to learn about Git Conflicts in Tamil.
Topics Covered:
1. Why Git conflicts occurs?
2. What is Git Conflicts?
3. What are ways to resolve git merge conflicts?
4. How to resolve Git Merge Conflicts?
5. How to resolve git merge conflicts in github / bitbucket?
6. How to resolve git merge conflicts through command line.
Complete Tamil Tutorial Playlists:
Devops Tutorials: bit.ly/devops-...
Docker Tutorials: bit.ly/docker-...
Kubernetes Tutorials: bit.ly/kuberne...
Jenkins Tutorials: bit.ly/jenkins...
Git Tutorials: bit.ly/git-tut...
AWS Tutorials: bit.ly/aws-tut...
Linux Tutorials: bit.ly/linux-t...
Terraform Tutorials: bit.ly/terrafo...
Ansible Tutorials: bit.ly/ansible...
Blogging Tips: bit.ly/bloggin...
Previous Recommended Video:
DevOps Explained in Tamil | Become DevOps Engineer | DevOps in Tamil
• DevOps Explained in Ta...
GIT in Tamil #1 | What is GIT | GIT Explained with Examples | Git Tutorial Tamil
• GIT in Tamil #1 | What...
GIT in Tamil #2 | GIT Basics | GIT Commands | Git Tutorial in Tamil
• GIT in Tamil #2 | GIT ...
GIT in Tamil #3 | Git Remote Repository Explained | Setup GitHub | Git Tutorial
• GIT in Tamil #3 | Git ...
GIT in Tamil #4 | Git Branching & Merging Strategy Explained | Git Tutorial
• GIT in Tamil #4 | Git ...
GIT in Tamil #5 | Git Rebase vs Git Cherry-Pick vs Git Stash | Git Tutorial
• GIT in Tamil #5 | Git ...
GIT in Tamil #6 | How to Resolve Git Merge Conflicts? | Git Tutorial
• GIT in Tamil #6 | How ...
GIT in Tamil #7 | What is GIT Squash? | Git Tutorial for Beginners
• GIT in Tamil #7 | What...
Make sure you have Subscribe to our channel @selvatechitops for more interesting videos and stay connected with us on social networking sites to get further updates immediately.
Click here to Subscribe: bit.ly/selvatec...
Facebook : / selvatechitops
Twitter : / selvatechitops
Instagram : / selvatechitops
Pinterest : / selvatechitops
Telegram : t.me/selvatech...
Linkedin : / selvatechitops
Support our Other RU-vid Channel : bit.ly/learnitg...
My IT Tech Blog: www.learnitgui...
#git #devops #learngit #gitintamil #selvatechitops #devops #vcs #gittutorial #gittutorialforbeginners #gitbasics #gitessentials #gittutorialtamil #gittamil #gitlearning #learninggit

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

17 сен 2024

Ссылка:

Скачать:

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

Добавить в:

Мой плейлист

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

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

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

Thank you for watching this video. Make sure you have Subscribe to our channel @selvatechitops for more interesting videos and stay connected with us on social networking sites to get further updates immediately. Click here to Subscribe: bit.ly/selvatechitops Facebook : facebook.com/selvatechitops Twitter : twitter.com/selvatechitops Instagram : instagram.com/selvatechitops Pinterest : www.pinterest.com/selvatechitops Telegram : t.me/selvatechitops Linkedin : www.linkedin.com/in/selvatechitops

@gunasekaran8830 19 дней назад

it was really useful me.. thank you so much for your clarification.

@SELVATechITOps 18 дней назад

Thanks bro, Stay subscribed. keep provide your support and share with your friends.

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

V nice. Found an Exordinary teacher today :)

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

Thanks & Awesome , You explained what really needed and in a very simple way

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

Thank You @Aarthi for taking some time to comment and appreciate the efforts. We appreciate your comment which encourages us to give more videos. Checkout our other videos too, ru-vid.comvideos Also You can get regular updates from our technical blog - www.learnitguide.net. Hope you have subscribed our channel, if not Subscribe now to not miss any updates. (bit.ly/selvatechitops).

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

Excellent Selva all your Git Hun series vidoes.

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

Thank you Venkatesh for your feedback.

@ranjanrnj6864 Год назад

Great explanations and have watched the playlist sir, rombo Thanks!

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

Thank you bro

@SELVATechITOps 18 дней назад

Thanks bro, Stay subscribed. keep provide your support and share with your friends.

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

thanks for the video

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

Clear explanation thanks

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

Thank You @Senthil for taking some time to comment and appreciate the efforts. We appreciate your comment which encourages us to give more videos. Checkout our other videos too, ru-vid.comvideos Also You can get regular updates from our technical blog - www.learnitguide.net. Hope you have subscribed our channel, if not Subscribe now to not miss any updates. (bit.ly/selvatechitops).

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

Hats off Selva sir 🙌 plz do videos on below topic: Ansible Jenkins Docker... waiting for it 🕰️

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

Sure Mano. I am on it. After this Git Series, we have Ansible, Docker, Kubernetes, Jenkins and many more.

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

@@SELVATechITOps thanks for the reply 👍

@dhanasekaranm8930 Год назад

Good Explanation. Thank you 😊

@prasanthpn4725 Год назад

very useful video thanks broi

@sg8nj Год назад

Excellent💯👍

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

Thank you so much sir

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

Thank you for your feedback and support.

@Deepakumari-io4nt Год назад

Apache camel with java springboot pathe full video potungalean plz

@r.rajalakshmi369 Год назад

Doubts: If i have some changes in a file, but developer also made a change in it and his changes are the ones to be retained. but my changes i would like to keep it as a reference, what to do. can keep in a branch without pushing? or for now i want to park my changes somewhere and like to use it later, what to do? can i stash it after commiting a change?

@ManiKandan-vo2qr 2 года назад

Hello Sir , i have a small doubt here . We are actually get conflict inside the Bitcucket/Git hub interfact during we try to merge the code to master and also when we try to Pull the code from master to local ( this way only you resolved ) . So it means we can check whether the conflict is present by try to pull code from master ? please correct my understanding

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

Yes if there is a conflicts, it will show you error when you pull from the branch. then we have to fix it.

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

Hi sir, Please clear my doubt, a conflict occur only when different changes made to a same file by different person without pulling the recent change am i right? If so , then if 2 developers did changes to two different files and pushed to origin no conflict occurs , is my understanding correct sir, please do reply, TIA

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

Yes you are right. Not only for different developers. Also on some cases, even with single developer, version control will have conflict saying which line you want to keep, if you have commited many changes on same line with different values.. Its our job to resolve that is because, its three tier architecture and it is always good when we have multiple branches.

@tamil_coders Год назад

Hi, is there any way we can automate this through command line.

@SELVATechITOps Год назад

No bro, this has to be done manually, because which line of code needed is based on the situation. it may vary. so automation is not recommended here. but basically git will try to resolve auto resolve. if not happened, then we have to do manually.