Bitbucket+sourcetree+p4merge for Windows version control

The reason for choosing BitBucket as a warehouse here is that it can set up a 5-person team under the premise of setting up a private warehouse: https://bitbucket.org/registration BitBucket II: http://www.sourcetreeapp.com/ download/(Download sourcetree install, select default path) Three: Http://www.perforce.com/downloads/Perforce/Customer (download p4merge install select default path) Four: Set P4merge as the external processing conflict Merge tool in the Sourcetree configuration file (below is the code added to the Sourcetree configuration file) Tool           = P4merge [Difftool "P4merge"]           Path =/ C/program Files/perforce/p4merge.exe # #  for Windows (here is the path to install P4) [merge]          tool = P4merge [Mergetool "P4merge"]< C4/>path =/c/program Files/perforce/p4merge.exe # # for Windows          Trustexitcode = true          Keepbackup = Falsewindows Use Sourcetree Note: The default installation of the P4merge in the conflict resolution if there is a garbled language, then we select the upper left corner of the menu bar File->charactor Encoding the format is modified to UTF-8 before it can be stored

　　

Bitbucket+sourcetree+p4merge for Windows version control