In this video, we see how to resolve a merge conflict using a git merge tool. First, we download and set the PATH environment variable for P4Merge. Then we include the P4Merge as the diff tool and merge tool in git configuration. Here are the commands to change git global configuration:
git config --global merge.tool p4merge
git config --global diff.tool p4merge
--------------------------------------------------
🎬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 12. Git Merge Tool Configuration | P4Merge online without registration, duration hours minute second in high quality. This video was added by user Tamil Tech Guru 03 May 2022, don't forget to share it with your friends and acquaintances, it has been viewed on our site 1,934 once and liked it 26 people.