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

{% capture notes %}
Note placeholder
{% endcapture %}
{% include hydeslides/core/notes %}


Resolving a conflict during a rebase

```bash
$ git add [conflicting-file]
$ git rebase --continue
```
