---
chapter: Merge
layout: slide
tags:
- diagram
- merge
- short-merge
diagram_svg_path: "assets/diagrams/merge-fast-forward.svg"
---

{% capture notes %}
(diagram: conflicting merge)
{% endcapture %}
{% include hydeslides/core/notes %}
