29
BOOST YOUR DEV TEAM’S SPEED AND PRODUCTIVITY Duy Lam .::. Aug 2013 © 2013 KMS Technology 1

Git - Boost Your DEV Team Speed and Productivity

Tags:

Embed Size (px)

DESCRIPTION

At the tech talks hosted by ITViec, Mr. Duy Lam - Software Architect of KMS Technology delivered a topic of Git - a free and open source distributed control system.

Citation preview

Page 1: Git - Boost Your DEV Team Speed and Productivity

© 2013 KMS Technology 1

BOOST YOUR DEV TEAM’S SPEED AND PRODUCTIVITY

Duy Lam .::. Aug 2013

Page 2: Git - Boost Your DEV Team Speed and Productivity

© 2013 KMS Technology 2

AGENDA

Git Introduction Branch in Git Remote Git Git Practices

Page 3: Git - Boost Your DEV Team Speed and Productivity

© 2013 KMS Technology 3

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
http://vn.linkedin.com/in/duylamphuong
http://vn.linkedin.com/in/duylamphuong
http://vn.linkedin.com/in/duylamphuong
Page 4: Git - Boost Your DEV Team Speed and Productivity

© 2013 KMS Technology 4

WHAT YOU TAKE IN THE END

GitUse GitUse Git EffectivelyGit for advanced needsGit or else?

Page 5: Git - Boost Your DEV Team Speed and Productivity

© 2013 KMS Technology 5

AGENDA

Git Introduction Branch in Git Remote Git Git Practices

Page 6: Git - Boost Your DEV Team Speed and Productivity

© 2013 KMS Technology 6

VERSION CONTROL SYSTEM TYPES

Centralized Version Control System

Distributed Version Control System

Page 7: Git - Boost Your DEV Team Speed and Productivity

© 2013 KMS Technology 7

THREE GIT TRAITS#1 COMMITS ARE

SNAPSHOT

Page 8: Git - Boost Your DEV Team Speed and Productivity

© 2013 KMS Technology 8

THREE GIT TRAITS#2 WORK WITHOUT

NETWORK

Page 9: Git - Boost Your DEV Team Speed and Productivity

© 2013 KMS Technology 9

THREE GIT TRAITS#3 TWO STATES

Working Directory Git Repository

git addgit rmetc.

git commit

Git Index / Staging Area

Page 10: Git - Boost Your DEV Team Speed and Productivity

© 2013 KMS Technology 10

BASIC WORKS(DEMO)

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

Page 11: Git - Boost Your DEV Team Speed and Productivity

© 2013 KMS Technology 11

AGENDA

Git Introduction Branch in Git Remote Git Git Practices

Page 12: Git - Boost Your DEV Team Speed and Productivity

© 2013 KMS Technology 12

BRANCH AND HOW IT WORKS

1 2

34

Page 13: Git - Boost Your DEV Team Speed and Productivity

© 2013 KMS Technology 13

MERGING BRANCH FAST FORWARD

git merge hotfix

Page 14: Git - Boost Your DEV Team Speed and Productivity

© 2013 KMS Technology 14

MERGING BRANCHNON FAST FORWARD

git merge iss53

Page 15: Git - Boost Your DEV Team Speed and Productivity

© 2013 KMS Technology 15

AGENDA

Git Introduction Branch in Git Remote Git Git Practices

Page 16: Git - Boost Your DEV Team Speed and Productivity

© 2013 KMS Technology 16

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
https://help.github.com/articles/generating-ssh-keys
https://help.github.com/articles/generating-ssh-keys
Page 17: Git - Boost Your DEV Team Speed and Productivity

© 2013 KMS Technology 17

REMOTE BRANCH

Time

Page 18: Git - Boost Your DEV Team Speed and Productivity

© 2013 KMS Technology 18

REMOTE TRACKING BRANCH

a local branch associated with remote branch

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

Page 19: Git - Boost Your DEV Team Speed and Productivity

© 2013 KMS Technology 19

UPDATE WITH REMOTE REPOSITORY

GET CHANGES #1

Time

git fetch origin

Page 20: Git - Boost Your DEV Team Speed and Productivity

© 2013 KMS Technology 20

UPDATE WITH REMOTE REPOSITORY

GET CHANGES #2

Time

git pull origin

master

origin/master

Page 21: Git - Boost Your DEV Team Speed and Productivity

© 2013 KMS Technology 21

UPDATE WITH REMOTE REPOSITORY

SAVE CHANGES

masterorigin/master

git.ourcompany.com

Time

master

masterorigin/master

git push origin

Page 22: Git - Boost Your DEV Team Speed and Productivity

© 2013 KMS Technology 22

BASIC WORKS(DEMO)

Create remote git repository Get new commits from remote

repository Save new commits to remote

repository

Page 23: Git - Boost Your DEV Team Speed and Productivity

© 2013 KMS Technology 23

AGENDA

Git Introduction Branch in Git Remote Git Git Practices

Page 24: Git - Boost Your DEV Team Speed and Productivity

© 2013 KMS Technology 24

HIGHLIGHT OF GIT FEATURES

(DEMO) git tag git stash git submodule

Page 25: Git - Boost Your DEV Team Speed and Productivity

© 2013 KMS Technology 25

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/
Page 26: Git - Boost Your DEV Team Speed and Productivity

© 2013 KMS Technology 26

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

Page 27: Git - Boost Your DEV Team Speed and Productivity

© 2013 KMS Technology 27

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

Page 28: Git - Boost Your DEV Team Speed and Productivity

© 2013 KMS Technology 28

GIT PRACTICES

Prefer --no-ff option on merging

Page 29: Git - Boost Your DEV Team Speed and Productivity

© 2013 KMS Technology

THANK YOU

© 2013 KMS Technology 29

Thank You


CS140 Project 1: Threads - Stanford University · git basics git add git commit git pull git push git merge git branch * Lots of git tutorials and help available online

CS140 Project 1: Threads - Stanford University · git basics git add git commit git pull git push git merge git branch * Lots of git tutorials and help available online

Documents
2012 GIT English - Ape Panthiya GIT English... · 2012 GIT English @ apepanthiya.lk Subject: G.C.E A/L GIT Past Papers Keywords: git, al git, git papers, git past papers, git exam,

2012 GIT English - Ape Panthiya GIT English... · 2012 GIT English @ apepanthiya.lk Subject: G.C.E A/L GIT Past Papers Keywords: git, al git, git papers, git past papers, git exam,

Documents
Git avanzado - Mario González, formador y desarrollador web · 2019-10-01 · git fetch + git rebase = git pull --rebase Subir tags: git push --tags Git avanzado. Repositorios remotos

Git avanzado - Mario González, formador y desarrollador web · 2019-10-01 · git fetch + git rebase = git pull --rebase Subir tags: git push --tags Git avanzado. Repositorios remotos

Documents
git-flow - jesusamieiro.com · $ git flow release help $ git flow release list $ git flow release start 0.1.0 $ git branch -a -v $ echo "0.1.0" >> version.txt $ git add version.txt

git-flow - jesusamieiro.com · $ git flow release help $ git flow release list $ git flow release start 0.1.0 $ git branch -a -v $ echo "0.1.0" >> version.txt $ git add version.txt

Documents
Git for version control and collaboration Part 2 · # Update Git Hub repository git push origin master . Branch 12 b a c e d f g master dev Git allows and encourages you to have multiple

Git for version control and collaboration Part 2 · # Update Git Hub repository git push origin master . Branch 12 b a c e d f g master dev Git allows and encourages you to have multiple

Documents
Migrating to Git: Let's Git this party started · Git: •git fast-import CVS content into temporary Git repository •Git-move-refs •git prune, repack, gc and repack •Validate

Migrating to Git: Let's Git this party started · Git: •git fast-import CVS content into temporary Git repository •Git-move-refs •git prune, repack, gc and repack •Validate

Documents
Git Best Practices - MariaDB.org...$ git push Write a good commit message! Regular git workflow $ git checkout bb-10.2-bug $ # Code, build, test... $ git add . $ git commit $ git push

Git Best Practices - MariaDB.org...$ git push Write a good commit message! Regular git workflow $ git checkout bb-10.2-bug $ # Code, build, test... $ git add . $ git commit $ git push

Documents
new repository – clone · Initialized empty Git repository abaj ric@nb01 — Terminal git-demo . git in /home/abaj ric/git-demo.git/ Terminal abajric@nb01 -/git-demo-local S git

new repository – clone · Initialized empty Git repository abaj ric@nb01 — Terminal git-demo . git in /home/abaj ric/git-demo.git/ Terminal abajric@nb01 -/git-demo-local S git

Documents
PetaLinux Tools Documentation - Xilinx · git git 1.8.3 git 1.7.1 git 1.7.1 git 1.8.3 git 1.8.3 git 1.7.1 or above ... If yo u wish to keep the license for your records, ... • Clean

PetaLinux Tools Documentation - Xilinx · git git 1.8.3 git 1.7.1 git 1.7.1 git 1.8.3 git 1.8.3 git 1.7.1 or above ... If yo u wish to keep the license for your records, ... • Clean

Documents
Git & dev ops come together, right now!

Git & dev ops come together, right now!

Technology
Git Down, Git On Up: Practical Examples of Intermediate Git Techniques

Git Down, Git On Up: Practical Examples of Intermediate Git Techniques

Software
IBM Notes Performance Boost - Reloaded (DEV-1185)

IBM Notes Performance Boost - Reloaded (DEV-1185)

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

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

Technology
Git - Single Repository - Drexel Universitykschmidt/CS265/Lectures/Git/git-single.pdfGit - Single Repository Kurt Schmidt Intro First Repository git init git add ... The Actual Repository

Git - Single Repository - Drexel Universitykschmidt/CS265/Lectures/Git/git-single.pdfGit - Single Repository Kurt Schmidt Intro First Repository git init git add ... The Actual Repository

Documents
Moving Beyond Nagios Next Generation Monitoring - … · Nagios pain - Configuration • Nagios config in separate git repo • vast differences b/w dev, stages, & prod ... Making

Moving Beyond Nagios Next Generation Monitoring - … · Nagios pain - Configuration • Nagios config in separate git repo • vast differences b/w dev, stages, & prod ... Making

Documents
Git Tricks — git utilities that make life git easier

Git Tricks — git utilities that make life git easier

Education
Git & e git beginner workshop

Git & e git beginner workshop

Technology
Manual Git y Git Hub

Manual Git y Git Hub

Documents
2013 GIT Sinhala @ apepanthiya GIT Sinhala... · 2013 GIT Sinhala @ apepanthiya.lk Subject: G.C.E A/L GIT Past Papers Keywords: git, al git, git papers, git past papers, git exam,

2013 GIT Sinhala @ apepanthiya GIT Sinhala... · 2013 GIT Sinhala @ apepanthiya.lk Subject: G.C.E A/L GIT Past Papers Keywords: git, al git, git papers, git past papers, git exam,

Documents
Git, smart git & gitflow

Git, smart git & gitflow

Internet
Git & Git Workflows

Git & Git Workflows

Software
By: Anuj Sharma. Topics covered: GIT Introduction GIT Benefits over different tools GIT workflow GIT server creation How to use GIT for first

By: Anuj Sharma. Topics covered: GIT Introduction GIT Benefits over different tools GIT workflow GIT server creation How to use GIT for first

Documents
YYj t Y GIT) GIT)...(k)GIT) (jJlJY) HP-K IN) Sam le Book GIT) * \YYj t Y GIT) GIT) Created Date 11/12/2018 3:39:52 PM

YYj t Y GIT) GIT)...(k)GIT) (jJlJY) HP-K IN) Sam le Book GIT) * \YYj t Y GIT) GIT) Created Date 11/12/2018 3:39:52 PM

Documents
Git J Club Dm Git

Git J Club Dm Git

Health & Medicine
PowerPoint Presentation€¦ · $ git init $ git add $ git status $ git commit $ git push $ git pull $ git clone • • • • • • • • $ sudo apt-get install

PowerPoint Presentation€¦ · $ git init $ git add $ git status $ git commit $ git push $ git pull $ git clone • • • • • • • • $ sudo apt-get install

Documents
Git and git flow

Git and git flow

Technology
Git LFS - acailly.github.io · $ git config --list [...] filter.lfs.clean=git-lfs clean -- %f filter.lfs.smudge=git-lfs smudge -- %f filter.lfs.process=git-lfs filter-process filter.lfs.required=true

Git LFS - acailly.github.io · $ git config --list [...] filter.lfs.clean=git-lfs clean -- %f filter.lfs.smudge=git-lfs smudge -- %f filter.lfs.process=git-lfs filter-process filter.lfs.required=true

Documents
Fedora Classroom · 2018. 8. 13. · Git repository: Fedora Council Docs Git repository: Quick Docs Git repository: Mentored Projects Git repository: Fedora Modularity Git repository:

Fedora Classroom · 2018. 8. 13. · Git repository: Fedora Council Docs Git repository: Quick Docs Git repository: Mentored Projects Git repository: Fedora Modularity Git repository:

Documents
Git in pills : git stash

Git in pills : git stash

Technology
GIT BASICS FOR EVERYONE...Git installation Macbook: If Xcode exists, probably you already have git. Check with `git —version` `brew install git` Windows: Download windows git installer

GIT BASICS FOR EVERYONE...Git installation Macbook: If Xcode exists, probably you already have git. Check with `git —version` `brew install git` Windows: Download windows git installer

Documents