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 [2016/09/02 13:26] Brandon Kallaher [Getting Started] |
cs:git:start [2017/09/11 15:47] Sean Kallaher [Branches] |
||
|---|---|---|---|
| Line 13: | Line 13: | ||
| The workflow we use consists of a few types of branches. | The workflow we use consists of a few types of branches. | ||
| - | 1. ''dev'' - This branch can be assumed to always be stable, meaning the code in these branches should always compile, and should pass all unit/module tests. User branches are merged into dev after passing a code review. | + | 1. ''master'' - This branch can be assumed to always be stable, meaning the code in these branches should always compile, and should pass all unit/module tests. User branches are merged into master after passing a code review. |
| - | 2. ''master'' - In contrast to dev, this branch is considered to be super-stable, meaning it meets all the requirements of dev, and in addition the code has been verified via sucessful pool test. Dev leads master, and master catches up to dev whenever the code in dev is considered super-stable. | + | 2. ''user/feature branches'' - These types of branches are the main ones most people will be directly interacting with. When naming your branches, it's recommended to prefix the branch name with your name. For example, if John Doe was working on thruster code, he would name his branch "john/thruster". |
| - | + | ||
| - | 3. ''user/feature branches'' - These types of branches are the main ones most people will be directly interacting with. When naming your branches, it's recommended to prefix the branch name with your name. For example, if John Doe was working on thruster code, he would name his branch "john/thruster". | + | |
| ===== Rebase/Integration Method ===== | ===== Rebase/Integration Method ===== | ||
