1. SVN GIT
Server Server
History (remote)
INTERNET 面對它
fetch
Server cache pull
commit
(FETCH_HEAD)
放下它
接受它 push
merge
History
(index)
處理它
Working commit
tree To be
committed
(stage) commit -a
add
add -p
Working
tree add
add
Untracked Untracked

2. Branch
( 僅供參考 )
master
(RD)
testing
(PM)
release
(Client)
Tag
milestone 1 milestone 2 version 1 version 2

3. .gitignore
● To keep generated files out of repository.
– Eg : *.apk *.o bin/ cache/
● Templates: https://github.com/github/gitignore

4. submodule+branch
App Workspace libUtil
libUtil
App branch
App libUtil
cd app_workspace/
git submodule add git@blah.net:libUtil.git libUtil
cd libUtil/
git branch app
git checkout app
//edit something
git commit -a -m 'changes for app'
git push origin app
cd ../
git add .gitmodules libUtil/
git commit -m 'import libUtil'