File tree Expand file tree Collapse file tree
common-content/en/blocks/git-branching-workshop Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -35,25 +35,38 @@ This workshop will show you:
3535
3636### Exercise: Map the Branch Structure
3737
38- Look at these two diagrams of a repository.
39-
40- ** Diagram 1: Clean branch structure**
41-
42- ```
43- main: A--B--C--D--F
44- \
45- topic-1: E
38+ Look at this diagram of a repository:
39+
40+ ``` mermaid
41+ gitGraph
42+ commit id: "A"
43+ commit id: "B"
44+ commit id: "C"
45+ commit id: "D"
46+ commit id: "F"
47+ branch topic-1
48+ checkout topic-1
49+ commit id: "E"
4650```
4751
48- ** Diagram 2: Problem - topic-2 was branched from topic-1, not main**
49-
50- ```
51- main: A--B--C--D--F
52- \
53- topic-1: E--G--H
54- \
55- topic-2: (branched from topic-1, not main)
56- I--J
52+ And this PR that was submitted:
53+
54+ ``` mermaid
55+ gitGraph
56+ commit id: "A"
57+ commit id: "B"
58+ commit id: "C"
59+ commit id: "D"
60+ commit id: "F"
61+ branch topic-1
62+ checkout topic-1
63+ commit id: "E"
64+ commit id: "G"
65+ commit id: "H"
66+ branch topic-2
67+ checkout topic-2
68+ commit id: "I"
69+ commit id: "J"
5770```
5871
5972** Task:** In your own words, answer these questions:
You can’t perform that action at this time.
0 commit comments