Download pdf - Git workflow

Transcript
Page 1: Git workflow

Workflow GIT

chez pmsipilot

Page 2: Git workflow

branches

1. création d'une branche2. push origin3. checkout

Page 3: Git workflow

branches

1. création d'une branche

Page 4: Git workflow

branches

1. création d'une branche

> git branch ticket_1337

Page 5: Git workflow

branches

1. création d'une branche

> git checkout ticket_1337ou si plus rapide : git checkout -b ticket_1337

Page 6: Git workflow

branches

1. création d'une branche

> git commit (x2)

Page 7: Git workflow

branches

1. création d'une branche

> git checkout master

Page 8: Git workflow

branches

1. création d'une branche

> git commit

Page 9: Git workflow

branches

2. push origin

Page 10: Git workflow

branches

2. push origin

> git push origin ticket_1337

Page 11: Git workflow

branches

3. checkout

Page 12: Git workflow

branches

3. checkout

> git checkout -b ticket_1337 origin/ticket_1337

Page 13: Git workflow

workflow

1. 2 équipes2. un master sain3. une branche par feature

Page 14: Git workflow

workflow

3. une branche par feature

Page 15: Git workflow

workflow

3. une branche par feature

> git checkout -b hotfix> git commit

Page 16: Git workflow

workflow

3. une branche par feature

> git checkout master> git merge hotfix

Page 17: Git workflow

workflow

3. une branche par feature

> git merge ticket_1337

Page 18: Git workflow

workflow

3. une branche par feature

> git checkout master> git merge hotfix

Page 19: Git workflow

workflow

3. une branche par feature

> git rebase ticket_1337

Page 20: Git workflow

pmsiQuizz

1. HEAD 2. merge & rebase3. working tree & staging area (add)4. remote (fetch)5. fast-forward 6. RTFM

Page 21: Git workflow

1. pflow2. pflow branch3. pflow ticket start, publish, update, finish


Recommended