Add d3 git branching demo with concurrent dev and rebase
authorbencomp <ben@companjen.name>
Thu, 7 May 2015 13:20:17 +0000 (15:20 +0200)
committerbencomp <ben@companjen.name>
Thu, 7 May 2015 13:20:17 +0000 (15:20 +0200)
git/branching/strategy/d3 [new file with mode: 0644]

diff --git a/git/branching/strategy/d3 b/git/branching/strategy/d3
new file mode 100644 (file)
index 0000000..f0b3aa7
--- /dev/null
@@ -0,0 +1,23 @@
+git tag tag40
+git checkout -b featureA
+git commit
+git commit
+git checkout master
+git checkout -b featureB
+git commit
+git checkout featureA
+git commit
+git checkout master
+git merge featureA
+git tag tag401
+git commit
+git checkout -b bugC
+git commit
+git commit
+git checkout master
+git merge bugC
+git checkout featureB
+git rebase master
+git checkout master
+git merge featureB
+git tag tag402
\ No newline at end of file