[HCM-August 13] Tech Talk on Git: Use Git to Boost Your Dev Team's Speed and Productivity

© 2013 KMS Technology

http://www.kms-technology.com/

© 2013 KMS Technology 2

BOOST YOUR DEV TEAM’S SPEED AND PRODUCTIVITY

Duy Lam .::. Aug 2013


AGENDA

Git Introduction Branch in Git Remote Git Git Practices


ABOUT ME

Software Architectat KMS Technology Vietnam

[email protected] http://vn.linkedin.com/in/duylamphuong

Lâm Phương Duy

mailto:[email protected]

http://vn.linkedin.com/in/duylamphuong





WHAT YOU TAKE IN THE END

GitUse GitUse Git EffectivelyGit for advanced needsGit or else?


AGENDA



VERSION CONTROL SYSTEM TYPES

Centralized Version Control System

Distributed Version Control System


THREE GIT TRAITS#1 COMMITS ARE

SNAPSHOT


THREE GIT TRAITS#2 WORK WITHOUT

NETWORK


THREE GIT TRAITS#3 TWO STATES

Working Directory Git Repository

git addgit rmetc.

git commit

Git Index / Staging Area


BASIC WORKS(DEMO)

Create new git repository Work on git staging area Update git repository Check status Undo


AGENDA



BRANCH AND HOW IT WORKS

1 2

34


MERGING BRANCH FAST FORWARD

git merge hotfix


MERGING BRANCHNON FAST FORWARD

git merge iss53


AGENDA



REMOTE URLS

Local /data/git/project.gitSSH* user@server:project.gitGit git://server/project.git

HTTP http://server/project.git

(*) Setup authentication: https://help.github.com/articles/generating-ssh-keys

https://help.github.com/articles/generating-ssh-keys




REMOTE BRANCH

Time


REMOTE TRACKING BRANCH

a local branch associated with remote branch

> git branch --track [branch] [remote name]/[branch]


UPDATE WITH REMOTE REPOSITORY

GET CHANGES #1

Time

git fetch origin



GET CHANGES #2

Time

git pull origin

master

origin/master



SAVE CHANGES

masterorigin/master

git.ourcompany.com

Time

master

masterorigin/master

git push origin


BASIC WORKS(DEMO)

Create remote git repository Get new commits from remote

repository Save new commits to remote

repository


AGENDA



HIGHLIGHT OF GIT FEATURES

(DEMO) git tag git stash git submodule


GIT CLIENTS

http://git-scm.com: Git CLI (command line interface)

UI clients– TortoiseGit– SmartGit– SourceTree Free– Git Extensions

http://git-scm.com/

http://git-scm.com/


GIT OR SVN ?

Git SVN

Speed of operation Faster

Data loss Less

Independent and isolated environment Yes

Access control Yes

Locking mechanisms Yes

Storage space 1/30 size


GIT PRACTICES

Line-ending issue on platforms

Do not miss any file when committing in conflicted merge

Windows Mac & Linux

Problem \r\n \n

Solution git config --global core.autocrlf true git config --global core.autocrlf input


GIT PRACTICES

Prefer --no-ff option on merging


Thank You

[HCM-August 13] Tech Talk on Git: Use Git to Boost Your Dev Team's Speed and Productivity

Technology

Transcript of [HCM-August 13] Tech Talk on Git: Use Git to Boost Your Dev Team's Speed and Productivity