Скачать или смотреть Windows 10 Git Installation and Setup - P4Merge Installation and Git Integration

Part of the Windows 10 installation guide on how I install and setup Git for Windows (playlist). This video covers how to install a free visual diff/merge tool called the Helix Visual Merge Tool (aka P4Merge) from Perforce and integrate it with Git on Windows 10. While many tools have pretty good diff/merge integration with Git these days, 3-way diff/merge tools are still pretty rare and one that is free and cross-platform is even rarer. A good 3-way merge tool is useful when resolving complex merges where comparing against the common parent is critical.

Text instructions available here:
Common Tools: https://github.com/taylor-training-co...
Git on Windows: https://github.com/taylor-training-co...

Windows 10 Initial Setup and Common Tools:    • Windows 10 Fresh Setup with Common Tools (...  

Git for Windows Installations full playlist:    • Git for Windows (Windows 10) Installation ...  

Offical Perforce website: https://www.perforce.com/
P4Merge Download page: https://www.perforce.com/downloads/vi...