Permalink
Browse files

Split main slide into sub slides, for sanity.

And science
  • Loading branch information...
catsby committed Apr 27, 2011
1 parent 82a62e3 commit 9e3493d32050e8b9a87a756247ce47ac82ec101c
View
@@ -1,13 +1,4 @@
-!SLIDE
+!SLIDE center bullets
# Main Branches #
-!SLIDE center bullets pretty-uls
-# Master#
-
-- reflects **production ready** code
-- Every push to master is considered **a new release**
-
-!SLIDE center bullets pretty-uls
-# Develop #
-
-!SLIDE transition=scrollLeft center
+- Origins and integrations, ho!
View
@@ -0,0 +1,10 @@
+!SLIDE center bullets pretty-uls incremental
+# Master#
+
+- Reflects **production ready** code
+- Every push to master is considered **a new release**
+- Respect ma'h **authorita'h**
+
+!SLIDE center
+# I'm the Map! #
+![I'm the Map!](git_branching_model.png)
View
@@ -0,0 +1,12 @@
+!SLIDE center bullets pretty-uls incremental
+# Develop #
+
+- Reflects **on-going development** for the **next release**
+- Often called the **Integration Branch**
+- This is where **nightly builds** come from
+- When **Develop** is **stable** enough for a release, we make our way
+ down to **Master**
+
+!SLIDE center
+# I'm the Map! #
+![I'm the Map!](git_branching_model.png)
View
@@ -0,0 +1,4 @@
+!SLIDE center bullets
+# Supporting Branches #
+
+- Features, Releases, Hotfixes, oh my!
View
@@ -0,0 +1,12 @@
+!SLIDE center bullets pretty-uls incremental
+# Features #
+
+- Branch from **Develop**
+- Merge into **Develop** (--no-ff)
+- Naming convention: **feature/a-cool-feature**
+- **New hotness** for an **upcomming release**
+
+
+!SLIDE center
+# I'm the Map! #
+![I'm the Map!](git_branching_model.png)
View
@@ -0,0 +1,11 @@
+!SLIDE center bullets pretty-uls incremental
+# Releases#
+
+- Branch from **Develop**
+- Merge into **Develop** and **Master**
+- Naming convention: **release-x.y.z**
+- Last minute updates **before** a new **release**
+
+!SLIDE center
+# I'm the Map! #
+![I'm the Map!](git_branching_model.png)
View
@@ -0,0 +1,11 @@
+!SLIDE center bullets pretty-uls incremental
+# Hotfixes #
+
+- Branch from **Master**
+- Merge into **Develop** and **Master**
+- Naming convention: **hotfix-omfg-how-did-this-happen**
+- Need to fix **production,** **_now_**
+
+!SLIDE center
+# I'm the Map! #
+![I'm the Map!](git_branching_model.png)
Binary file not shown.

0 comments on commit 9e3493d

Please sign in to comment.