11. Git Merge Introduction | Resolving merge conflicts
We learned about merging in Git. We also see how a fast forward merge works and a merge conflict. Then we saw how we could use git checkout to resolve simple git conflicts.
Here are the list of commands used in the video:
git branching:
git checkout -b branchname
git checkout branchname
git switch branchname
git merging:
git merge branchname
git merge conflict:
git checkout --ours filename
git checkout --theirs filename
--------------------------------------------------
🎬Subscribe to our channel 🔔
/ tamiltechg
--------------------------------------------------
📲Watch our Flutter Video Series Here🤙
• Flutter Tamil Tutorial
--------------------------------------------------
💻Watch our Python Video Series Here👨💻👩💻
• Google Colab - Python Beginners
--------------------------------------------------
🐘Watch Yaanai Paal Video Series(short tech tips) Here🍼
• Yaanai Paal
--------------------------------------------------
🙏தமிழ் பேசும் அனைத்து நல்ல உள்ளங்களுக்கும் நன்றி🙏🏾
Watch video 11. Git Merge Introduction | Resolving merge conflicts online without registration, duration hours minute second in high quality. This video was added by user Tamil Tech Guru 10 April 2022, don't forget to share it with your friends and acquaintances, it has been viewed on our site 3,545 once and liked it 95 people.