bitbucket+sourcetree+p4merge for windows 版本控制

这里选择bitbucket作为仓库的原因是，它能够在设置私有仓库的前提下组建5人团队
一:https://bitbucket.org/ 注册bitbucket
二:http://www.sourcetreeapp.com/download/ （下载sourceTree安装,选择默认路径)
三:http://www.perforce.com/downloads/Perforce/Customer (下载P4Merge安装选择默认路径)
四:在sourcetree配置文件中将P4Merge设置为外部处理冲突合并工具(下面是增加到sourcetree配置文件中的代码)

           tool = p4merge
 [difftool "p4merge"]
           path = /c/Program Files/Perforce/p4merge.exe ## For Windows  (这里是安装p4的路径)
 [merge]
          tool = p4merge
 [mergetool "p4merge"]
          path = /c/Program Files/Perforce/p4merge.exe ## For Windows
          trustExitCode = true
          keepBackup = false

windows中使用sourcetree注意事项:默认安装的P4merge中在解决冲突时

如果有中文会出现乱码,这时我们选择左上角的菜单栏中的file->charactor Encoding将格式修改为UTF-8后才能存储