User Tools
Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision | Next revision Both sides next revision | ||
|
cs:git:start [2017/09/11 15:47] Sean Kallaher [Branches] |
cs:git:start [2017/09/11 15:47] Sean Kallaher [Rebase/Integration Method] |
||
|---|---|---|---|
| Line 21: | Line 21: | ||
| - Users always work on their own branch | - Users always work on their own branch | ||
| - | - When users feel their code is stable, they rebase onto the devbranch | + | - When users feel their code is stable, they rebase onto the master branch |
| - A code review will be set up, possibly resulting in software tweaks (back to step 1) | - A code review will be set up, possibly resulting in software tweaks (back to step 1) | ||
| - | - An integrator will fast-forward the dev branch up to the user’s branch | + | - An integrator will fast-forward the master branch up to the user’s branch |
| - | Integrators are a small group of people that control what code ends up going into the dev branch and keep the git repo clean. This group should only be a few people, possibly even just one person for each repository. Team leads might be a good person for this position. | + | Integrators are a small group of people that control what code ends up going into the master branch and keep the git repo clean. This group should only be a few people, possibly even just one person for each repository. Team leads might be a good person for this position. |
| The day-to-day workflow for users is as follows: | The day-to-day workflow for users is as follows: | ||
