11. Git Merge Introduction | Resolving merge conflicts
3.2 هزار بار بازدید -
2 سال پیش
-
We learned about merging in
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
--------------------------------------------------
🙏தமிழ் பேசும் அனைத்து நல்ல உள்ளங்களுக்கும் நன்றி🙏🏾
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
--------------------------------------------------
🙏தமிழ் பேசும் அனைத்து நல்ல உள்ளங்களுக்கும் நன்றி🙏🏾
2 سال پیش
در تاریخ 1401/01/21 منتشر شده
است.
3,287
بـار بازدید شده