add development sequence diagram

Author: Andrew Elder

README.md

@@ -247,7 +247,15 @@ Source documentation
 A standard tool, Doxygen, is used for generating documentation from the AVDECC Controller Lib source code.
 A link to the online version of the AVDECC Controller Lib documentation can be found at:
 http://www.audioscience.com/internet/download/sdk/avdecclib_usermanual_html/html/index.html
-			 
+
+Development Conventions
+=======================
+
+Developers should add new features to the *staging* git branch. Periodically the *staging* git branch
+will be merged to the *master* branch.
+
+![](git_dev_seq_uml.png)
+
 
 Roadmap
 =======

git_dev_seq_uml.png

@@ -0,0 +1,62 @@
+@startuml
+
+title Git branch conventions in avdecc-lib\ndevelopment sequence
+
+box "DeveloperX's\nenvironment" #LightBlue
+	actor DeveloperX
+	participant "branch\nin forked local\nDeveloperX's git repo" as LX
+end box
+
+box "DeveloperY's\nenvironment" #LightYellow
+	actor DeveloperY
+	participant "branch\nin forked local\nDeveloperY's git repo" as LY
+end box
+
+
+box "upstream git" #LightBlue
+	participant "<b>staging</b> branch\nin upstream repo" as S
+	participant "<b>master</b> branch\nin upstream repo" as M
+end box
+actor Manager
+
+note over DeveloperX
+	In this example DeveloperX is
+	working on a new feature
+end note
+
+DeveloperX -> LX: commits changes to forked git repo
+LX -> LX: many updates
+
+DeveloperX -> LX: completed a new feature
+LX -> S : git pull request
+S -> Manager : emailed pull request
+Manager -> S: do merge to staging
+S -> S : git merge
+
+Manager --> DeveloperX: email request to test staging
+Manager --> DeveloperY: email request to test staging
+
+note over DeveloperY
+	DeveloperY is taking on the role
+	of tester in this example
+end note
+
+
+loop until staging test signoff
+	S -> DeveloperY: pulls staging branch for testing
+	S -> LY: git pull
+	DeveloperY -> LY: commits bugfixes to forked git repo
+	LY -> S : git pull request
+	S -> Manager : emailed pull request
+	Manager -> S: do merge to staging
+	S -> S : git merge
+end
+
+==Signoffs for staging tests collected from all parties==
+
+Manager -> S: do merge
+S -> M: staging merged to master branch
+
+@enduml
+
+