---
chapter: Rewriting history
layout: slide
title: ''
tags:
- rewriting-history
---

{% capture notes %}
* Branch Preparation
* Rebasing __is not__ merging
* Conflicts can occur
* Resolution is simple
* Small variation to merge conflict
{% endcapture %}
{% include hydeslides/core/notes %}

Re-playing branch-specific commits against a base

```bash
$ git checkout <featurebranch>
$ git rebase master
```
