Started on GitHubFlow examples

Author: JakeGinnivan

docs/git-branching-strategies/gitflow-examples.md

@@ -1,9 +1,16 @@
 # GitFlow Examples
+These examples are using the *default* configuration with GitVersion. Which is [continuous deployment](../reference/continuous-deployment.md) mode for `develop` and [continuous delivery](../reference/continuous-delivery.md) mode for all other branches.
+
+This default configuration allows you to publish CI builds from develop to a CI MyGet feed, or another CI feed. Then all other branches are manually released then tagged. Read more about this at [version increments](../more-info/version-increments.md).
+
 ## Feature Branches
 Feature branches will take the feature branch name and use that as the pre-release tag.
 
 ![GitFlow](img/05119d0cd4ecaaefff94_feature-branch.png)
 
+Notice after the feature branch is merged, the version on `develop` is `1.3.0-unstable.3`. This is due to `develop` running in *continuous deployment* mode. If you configured `develop` to use *continuous delivery* the version would still be `1.3.0-unstable.1` and you would have to use release tags to increment the `unstable.1`.
+
+You can see the different on the feature branch itself, notice the version is the same before and after the commit on the feature branch? Only the metadata has changed. If you released the feature branch artifacts then tagged the commit, the following commit would increase to `-beta.2`.
 
 ## Pull Request
 Because feature branches are most likely pushed to a fork, we are showing the

docs/git-branching-strategies/githubflow-examples.md

@@ -1,6 +1,7 @@
 # GitHubFlow Examples
-## Continuous Delivery mode
-TODO Example of GitHubFlow using continuous delivery mode
 
-## Continuous Deployment mode
-TODO Example of GitHubFlow using continuous deployment mode
+## Feature branch
+![GitFlow](img/githubflow_feature-branch.png)
+
+## Pull requests
+![GitFlow](img/githubflow_pull-request.png)

docs/git-branching-strategies/githubflow.md

@@ -15,3 +15,5 @@ The main rule of GitHub Flow is that master should *always* be deployable. GitHu
 ## Resources
  - [GitHubFlow guide by GitHub](https://guides.github.com/introduction/flow/index.html)
  - [GitHub Flow original blog post](http://scottchacon.com/2011/08/31/github-flow.html)
+ - [Phil Haack's (haacked) GitHubFlow aliases](http://haacked.com/archive/2014/07/28/github-flow-aliases/)
+ - [GitHubFlow vs GitFlow](http://lucamezzalira.com/2014/03/10/git-flow-vs-github-flow/)

docs/git-branching-strategies/img/githubflow_feature-branch.png

@@ -302,4 +302,69 @@ public void GitFlowSupportMinorRelease()
             fixture.AssertFullSemver("1.4.0");
         }
     }
+
+
+    [Test]
+    public void GitHubFlowFeatureBranch()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config()))
+        {
+            fixture.Participant("master");
+
+            // GitFlow setup
+            fixture.Repository.MakeACommit();
+            fixture.ApplyTag("1.2.0");
+
+            // Branch to develop
+            fixture.MakeACommit();
+            fixture.AssertFullSemver("1.2.1+1");
+
+            // Open Pull Request
+            fixture.BranchTo("feature/myfeature", "feature");
+            fixture.Activate("feature/myfeature");
+            fixture.AssertFullSemver("1.2.1-myfeature.1+1");
+            fixture.MakeACommit();
+            fixture.AssertFullSemver("1.2.1-myfeature.1+2");
+
+            // Merge into master
+            fixture.Checkout("master");
+            fixture.MergeNoFF("feature/myfeature");
+            fixture.Destroy("feature/myfeature");
+            fixture.NoteOver("Feature branches should\r\n" +
+                             "be deleted once merged", "feature/myfeature");
+            fixture.AssertFullSemver("1.2.1+3");
+        }
+    }
+
+    [Test]
+    public void GitHubFlowPullRequestBranch()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config()))
+        {
+            fixture.Participant("master");
+
+            // GitFlow setup
+            fixture.Repository.MakeACommit();
+            fixture.ApplyTag("1.2.0");
+
+            // Branch to develop
+            fixture.MakeACommit();
+            fixture.AssertFullSemver("1.2.1+1");
+
+            // Open Pull Request
+            fixture.BranchTo("pull/2/merge", "pr");
+            fixture.Activate("pull/2/merge");
+            fixture.AssertFullSemver("1.2.1-PullRequest.2+1");
+            fixture.MakeACommit();
+            fixture.AssertFullSemver("1.2.1-PullRequest.2+2");
+
+            // Merge into master
+            fixture.Checkout("master");
+            fixture.MergeNoFF("pull/2/merge");
+            fixture.Destroy("pull/2/merge");
+            fixture.NoteOver("Feature branches/pr's should\r\n" +
+                             "be deleted once merged", "pull/2/merge");
+            fixture.AssertFullSemver("1.2.1+3");
+        }
+    }
 }