Git

Branching

Concepts

Git

Cherry-pick

&

Local

vs

Remote

Cherry-pick

Repository

Decentralized

Cherry-pick

Repository per project

everyone has his/hers

own repository

- full history

Rebase

offline access

Branch merge

backup on every computer

Stash

Folder update

not possible

Operations performed

on repository scale

jQuery 15 MB

php 130 MB

Doom 3 9 MB

Small

linux 735 MB

mono 218 MB

mongoDB 94 MB

Pick a cherry

node.js 60 MB

D F R S

bootstrap 20 MB

rails 60 MB

ast

mall

Fast

eliable

ecentralized

repository is a way smaller

super-fast branching

and merging

repository is local

File

BLOB

ZIP

Never rebase

pushed branch

Commits by

SHA-1 hashcode

"I see Subversion as

being the most

pointless project

ever started."

Frågor?

Fragen?

Reliable

Google Tech Talk: Linus Torvalds on git

www.youtube.com/watch?v=4XpnKHJAok8

(70m:15s)

*swedish

Branch

Merge

*schnitzlich

Branch merge

Spurningar?

*icelandic

Questions ?

Committing

Branching

Staging / index

References

Merge branch

into

current branch

Branching

References

Concepts

SVN

branch full copy

Web page

http://git-scm.com

Repositories

eBooks

Pro Git by Scott Chacon

http://git-scm.com/doc

unstaged

staged

committed

Rebase

http://git-scm.com/book

Committing

git

point to history

Rebase

Git Succinctly by Ryan Hodson

staging

http://www.syncfusion.com/

resources/techportal/

ebooks/git

Branching

working with branches

Local vs. remote

Apply

current

branch

push / pull concept

Branch

¿Preguntas?

Tools

ALWAYS

&

OFTEN

* spanish

Tools

Tools

Stash

Stash

Linux

Branches example

http://git-scm.com/downloads/guis

iOS

Windows

git gui

drawer

git-extensions

tortoise-git

Pitanja?

github for windows

*croatian

Templates

Branching

concepts

Feature

Branches

Release

Branch

Production

Hotfixes

master

Time

Hot-fixes in production

Release management

Feature development

Major feature for next release

Next Release

Bug fixed

hotfix 0.2

Production

Master

Release

Hot-Fix

Master

Feature 3

Feature 1

Feature 2

Feature for feature release

Feature 2 is completed and merged back to master

Features are merged with master

Pull the updates from master frequently

Incorporate bugfix in development

Feature 3 is created from master. Feature 1 does not exist in the new branch

Tag 0.2

Hotfix branch is created from production

All features are ready to it's time to release

Start of release branch

Pull the latest updates

then resolve conflicts

then merge back to master

Only fixes !

Feature 1 is completed and merged back to master

Feature 3 merges back with master and gets feature 1

Hotfix is merged with production branch. Get a new tag for the hotfix

Merge release branch with production branch and get a new tag

Bug fixes are continuously merged back into master

Hotfixes are merged back to master too

Feature 3 is completed and merged back to master

Bugfixes may be continuously merged back

Tag 1.0

Release is completed.

After the merge delete release branch

Credits:

Lemi Orhan Ergin, SONY

Git Branching Model

For Efficient Development

Vincent Driessen

A successful git branching

model