Slide 1

Slide 1 text

Git branching strategy

Slide 2

Slide 2 text

git checkout -b offline Creates a new branch called “offline” branching off from the current branch

Slide 3

Slide 3 text

git checkout dev Moves to an existing branch called “dev”

Slide 4

Slide 4 text

git branch -m watch clock Renames a branch called “watch” to “clock”

Slide 5

Slide 5 text

git branch -m develop Renames the current branch to “develop”

Slide 6

Slide 6 text

git branch -d develop Deletes the branch called “develop”

Slide 7

Slide 7 text

git merge --no-ff aria Merges the branch called “aria” into the current branch

Slide 8

Slide 8 text

git checkout -t origin/staging Create a new branch called “staging” that tracks the remote branch called “staging”

Slide 9

Slide 9 text

No content

Slide 10

Slide 10 text

Feature branches Release branches Hotfix branches

Slide 11

Slide 11 text

No content

Slide 12

Slide 12 text

git checkout -b

Slide 13

Slide 13 text

No content

Slide 14

Slide 14 text

git checkout dev git merge --no-ff

Slide 15

Slide 15 text

No content

Slide 16

Slide 16 text

git checkout staging git merge --no-ff dev

Slide 17

Slide 17 text

Feature branches Release branches Hotfix branches

Slide 18

Slide 18 text

No content

Slide 19

Slide 19 text

git checkout -b release-2.2.0

Slide 20

Slide 20 text

README.md CHANGELOG.md

Slide 21

Slide 21 text

No content

Slide 22

Slide 22 text

No content

Slide 23

Slide 23 text

git checkout master git merge --no-ff release-2.2.0 git tag 2.2.0

Slide 24

Slide 24 text

git push origin master 2.2.0

Slide 25

Slide 25 text

Feature branches Release branches Hotfix branches

Slide 26

Slide 26 text

No content

Slide 27

Slide 27 text

git checkout -b hotfix-2.2.1

Slide 28

Slide 28 text

README.md CHANGELOG.md

Slide 29

Slide 29 text

No content

Slide 30

Slide 30 text

git checkout -t origin/staging Create a new branch called “staging” that tracks the remote branch called “staging”

Slide 31

Slide 31 text

git push -u origin staging Push a local branch called “staging” to remote