---
layout:     post
title:      "Git Rebase - An alternative to merge"
subtitle:   "Learn to clean up your commit history with rebasing"
date:       2015-08-20 12:00:00
author:     "Chris McIntyre"
header-img: "img/rebase-branch.jpg"
---

## Background on Chris

Chris is an aspiring developer and an apprentice with theFirehoseProject. Seeing a mile long list of commits and an error due to merge conflicts is never a fun situation. Upon prodding from her mentor, she decided to dive into learning how to make a cleaner commit history with git rebase. Although terrifying at first, it's really nothing to fear and absolutely has a place in keeping code history clean. 

{% include youtubePlayer.html id="HcFKZntsyf8" %}

Watch the full video [here](https://www.youtube.com/watch?v=HcFKZntsyf8).

## Slides

<iframe src="//www.slideshare.net/slideshow/embed_code/key/CEYt1RfqkVDjku" width="900" height="450" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" style="border:1px solid #CCC; border-width:1px; margin-bottom:5px; max-width: 100%;" allowfullscreen> </iframe> 
---
layout:     post
title:      "Git Rebase - An alternative to merge"
subtitle:   "Learn to clean up your commit history with rebasing"
date:       2015-08-20 12:00:00
author:     "Chris McIntyre"
header-img: "img/rebase-branch.jpg"
---

## Background on Chris

Chris is an aspiring developer and an apprentice with theFirehoseProject. Seeing a mile long list of commits and an error due to merge conflicts is never a fun situation. Upon prodding from her mentor, she decided to dive into learning how to make a cleaner commit history with git rebase. Although terrifying at first, it's really nothing to fear and absolutely has a place in keeping code history clean.

{% include youtubePlayer.html id="HcFKZntsyf8" %}

Watch the full video [here](https://www.youtube.com/watch?v=fk7AQFLhFTE).

## Slides

<iframe src="//www.slideshare.net/slideshow/embed_code/key/CEYt1RfqkVDjku" width="900" height="450" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" style="border:1px solid #CCC; border-width:1px; margin-bottom:5px; max-width: 100%;" allowfullscreen> </iframe>

Fix video link in Chris M video
Fix video link in Chris M video
