背景
从事Android开发多年,几乎没写过博客,汗颜啊…
最近新公司刚入职,使用的代码管理工具是Git,无奈之前的公司一直使用SVN,对Git指令真的是小白一个;幸运的是,同事强烈推荐了一个神器:Sourcetree,第一次使用Sourcetree时也遇到了好多坑,让我一一道来吧…
第一个坑:安装
安装Sourcetree时遇到了一个小坑,下载完成后进入安装界面,然后一直停在需要注册
Bitbucket账号的页面,下一步也一直点击不了,大写的懵逼o(╥﹏╥)o
查找资料后才发现可以跳过注册步骤的:
- 打开sourcetree的文件夹:…\AppData\Local\Atlassian\SourceTree,如下图:
- 接下来你应该在当前文件夹下创建一个json文件,文件名为:accounts.json
- 编辑此文件的内容如下:
[
{
"$id": "1",
"$type": "SourceTree.Api.Host.Identity.Model.IdentityAccount, SourceTree.Api.Host.Identity",
"Authenticate": true,
"HostInstance": {
"$id": "2",
"$type": "SourceTree.Host.Atlassianaccount.AtlassianAccountInstance, SourceTree.Host.AtlassianAccount",
"Host": {
"$id": "3",
"$type": "SourceTree.Host.Atlassianaccount.AtlassianAccountHost, SourceTree.Host.AtlassianAccount",
"Id": "atlassian account"
},
"BaseUrl": "https://id.atlassian.com/"
},
"Credentials": {
"$id": "4",
"$type": "SourceTree.Model.BasicAuthCredentials, SourceTree.Api.Account",
"Username": "",
"Email": null
},
"IsDefault": false
}
]
- 重新打开Sourcetree就好了
坑二:添加忽略文件
第一次使用Sourcetree,有点不知所措,上传代码时不知道如何添加忽略文件,大写的尴尬
在gitignore中添加需要忽略的文件(针对Android项目):
# Compiled class file
*.class
# Log file
*.log
# BlueJ files
*.ctxt
# Mobile Tools for Java (J2ME)
.mtj.tmp/
# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
#ignore thumbnails created by windows
Thumbs.db
#Ignore files build by Visual Studio
*.obj
*.exe
*.pdb
*.user
*.aps
*.pch
*.vspscc
*_i.c
*_p.c
*.ncb
*.suo
*.tlb
*.tlh
*.bak
*.cache
*.ilk
*.log
*.dll
*.lib
*.sbr
*.class
local.properties
.DS_Store
.gitignore
.metadata
.idea
.gradle
build
*.iml
captures
gen
bin
lint.xml
org.eclipse.jdt.core.prefs