Skip to content

Commit 2f995c6

Browse files
committed
[mix-messy-graph] Add README
1 parent bbf8d54 commit 2f995c6

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

mix_messy_graph/README.md

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
# mix-messy-graph
22

3-
<!--- Insert exercise description -->
3+
You are writing user documentation for a product. You have already written documentation for a few new features, each in a separate branch. After merging the `feature-search` branch, you realise this way of merging can result in a complicated revision graph. Instead, you wish to merge these changes in a way that results in a simple linear revision graph.
44

55
## Task
66

7-
<!--- Insert exercise task, simplify what needs to be done -->
7+
1. Undo the merging of `feature-search`.
8+
2. Squash-merge the `feature-search` branch onto the `main` branch. Delete the `feature-search` branch.
9+
3. Similarly, squash-merge and delete the `feature-delete` branch, while resolving any merge conflicts -- in the `features.md`, the delete feature should appear after the search feature.
10+
4. The `list` branch is not needed, as you have decided not to have that feature. Delete that branch.
811

9-
## Hints
12+
The resulting revision graph should be as follows:
1013

11-
<!--- Insert hints here -->
12-
<!---
13-
Use Github Markdown's collapsible content:
14-
<details>
15-
<summary>...</summary>
16-
...
17-
</details>
18-
-->
14+
```mermaid
15+
gitGraph BT:
16+
commit id: "Add features.md"
17+
commit id: "Mention feature for creating books" tag: "v10"
18+
commit id: "Add the delete feature"
19+
commit id: "Add the search feature"
20+
```

0 commit comments

Comments
 (0)