Bitbucket+sourcetree+p4merge for Windows version control

Source: Internet
Author: User
Tags perforce sourcetree

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

Related Article

Contact Us

The content source of this page is from Internet, which doesn't represent Alibaba Cloud's opinion; products and services mentioned on that page don't have any relationship with Alibaba Cloud. If the content of the page makes you feel confusing, please write us an email, we will handle the problem within 5 days after receiving your email.

If you find any instances of plagiarism from the community, please send an email to: info-contact@alibabacloud.com and provide relevant evidence. A staff member will contact you within 5 working days.

A Free Trial That Lets You Build Big!

Start building with 50+ products and up to 12 months usage for Elastic Compute Service

  • Sales Support

    1 on 1 presale consultation

  • After-Sales Support

    24/7 Technical Support 6 Free Tickets per Quarter Faster Response

  • Alibaba Cloud offers highly flexible support services tailored to meet your exact needs.