feat: 1 task 2 (#6)

tonthanhhung · Aug 10, 2020 · 973ceaf · 973ceaf
1 parent 1a825a3
commit 973ceaf
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -1 +1,13 @@
-### Story/Task braching model
+### Story - Task git braching model
+
+1. When we merge task brach into story branch, with this selection 
+
+![create-merge-commit](create-merge-commit.png)
+
+We will come to the result commits are list down in the base PR (`feat/1`) like this 
+
+![result-merge-commit](result-merge-commit.png)
+
+Event though we have a `Verified` Badge, it still list all the commit from the merged PR
+
+2. When we merge task branch into story branch, with this selection 
diff --git a/create-merge-commit.png b/create-merge-commit.png
diff --git a/result-merge-commit.png b/result-merge-commit.png
diff --git a/task2 b/task2
@@ -0,0 +1,2 @@
+commit 1
+commit 2