---
chapter: Merge
layout: slide
tags:
- merge
- short-merge
---

	git checkout master
	git merge <featurebranch> -m<message>

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