7. Version Control
• Who is using version control?
dinsdag 18 oktober 11
8. Version Control
• Who is using version control?
• Who is using CVS?
dinsdag 18 oktober 11
9. Version Control
• Who is using version control?
• Who is using CVS?
• Who is using Subversion?
dinsdag 18 oktober 11
10. Version Control
• Who is using version control?
• Who is using CVS?
• Who is using Subversion?
• Who is using something else? and what?
dinsdag 18 oktober 11
11. Subversion
Server
Repository
Checkout Checkout Checkout Checkout
dinsdag 18 oktober 11
96. the “github way”
• fork
• clone
• develop in branch
dinsdag 18 oktober 11
97. the “github way”
• fork
• clone
• develop in branch
• push branch
dinsdag 18 oktober 11
98. the “github way”
• fork
• clone
• develop in branch
• push branch
• pull request
dinsdag 18 oktober 11
99. the “github way”
• fork
• clone
• develop in branch
• push branch
• pull request
• lead dev: merge/rebase, push to central repo
dinsdag 18 oktober 11
101. workflows
• local clone of your own repo
or
dinsdag 18 oktober 11
102. workflows
• local clone of your own repo
or
• local clone of central repo
dinsdag 18 oktober 11
103. workflows
• local clone of your own repo
or
• local clone of central repo
• work in branch
dinsdag 18 oktober 11
104. workflows
• local clone of your own repo
or
• local clone of central repo
• work in branch
• push branch
dinsdag 18 oktober 11
105. workflows
• local clone of your own repo
or
• local clone of central repo
• work in branch
• push branch
• lead dev: merge/rebase, push to master
dinsdag 18 oktober 11
106. workflows
• Git on your own
• local branch
• merge stable to master
• push to remote
dinsdag 18 oktober 11