From 875c49d0d13631bbef010c82a40e1403fafee8c9 Mon Sep 17 00:00:00 2001
From: Richard Littauer <richard.littauer@gmail.com>
Date: Tue, 30 Jun 2015 13:29:52 -0400
Subject: [PATCH] Added good rebase and merge tutorial

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 0e8b9e0..f78f08a 100644
--- a/README.md
+++ b/README.md
@@ -674,6 +674,7 @@ This will tell you if any commits are in one but not the other, and will give yo
 
 ## Tutorials
 
+* [Getting solid at Git rebase vs. merge](https://medium.com/@porteneuve/getting-solid-at-git-rebase-vs-merge-4fa1a48c53aa)
 * [git-workflow](https://github.com/asmeurer/git-workflow) - [Aaron Meurer](https://github.com/asmeurer)'s howto on using git to contribute to open source repositories
 
 ## Scripts & Tools