Added good rebase and merge tutorial

This commit is contained in:
Richard Littauer 2015-06-30 13:29:52 -04:00
parent 02e9ec921f
commit 875c49d0d1
1 changed files with 1 additions and 0 deletions

View File

@ -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