---
chapter: Merge
layout: slide
tags: ['merge','diagram']
---

<div class="diagram-group">
	<img class="diagram" src="assets/diagrams/merge/fast-forward-01.png">
	<img class="diagram fragment" src="assets/diagrams/merge/fast-forward-02.png">
	<img class="diagram fragment" src="assets/diagrams/merge/fast-forward-03.png">
    <img class="diagram fragment" src="assets/diagrams/merge/fast-forward-04.png">
    <img class="diagram fragment" src="assets/diagrams/merge/fast-forward-05.png">
    <img class="diagram fragment" src="assets/diagrams/merge/fast-forward-06.png">
</div>

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