P4merge visual merge tool
![p4merge visual merge tool p4merge visual merge tool](https://dotblogsfile.blob.core.windows.net/user/larrynung/1310/123_136E4/ScreenClip.7_2.jpg)
![p4merge visual merge tool p4merge visual merge tool](http://i.stack.imgur.com/LQH39.png)
If you only want a version, just click on the shape of the corresponding version, you can only keep the current content.The three icons on the default right side are colored, which represents the default three versions of the content unified merge file. The icon on the right corresponds to the three versions above. The merged operation, unified in the column below. The above three windows respectively correspond to this three versions. The three shapes here represent three versions of Remote, Base, and Local, respectively. The conflict resolution page is as follows: p4mergeAt this point, click Enter to confirm. Hit return to start merge resolution tool (p4merge ):Īt this point, the Git tool is recognized by default. Normal merge conflict for 'abc.txt' : : modified file Opendiff kdiff3 tkdiff xxdiff meld tortoisemerge gvimdiff diffuse diffmerge ecmerge p4merge araxis bc codecompare smerge emerge vimdiff nvimdiff 'git mergetool' will now attempt to use one of the following tools: See 'git mergetool -tool-help' or 'git help config' for more details. This message is displayed because 'merge.tool' is not configured. The following command execution results are seen. In a conflictful project, use the following command to adjust the merge tool to resolve conflicts. The execution is successful, indicating that it has been set. Open the git command line, do the following command git config -global diff.tool p4merge Second, set the Git tool default merge tool My currently installed directory is C:\Program Files\Perforce, Add this directory into the PATH variable.
P4MERGE VISUAL MERGE TOOL SOFTWARE
As shown below:Īfter the installation is complete, add the software installation directory to the environment variable. When installing, just select the P4MERGE installation.
![p4merge visual merge tool p4merge visual merge tool](https://qiita-image-store.s3.amazonaws.com/0/25990/524f6e3e-cc06-8ec2-a84e-ae82f1b89606.png)
Need to download the official software of P4MERGE, click Helix Visual Merge Tool Today | PerforceDownload.