Git Rebase vs. Merge

5a5fcbae333f071dc7a28f4958509db5?s=47 Miha Rekar
October 21, 2014

Git Rebase vs. Merge

Quick tech talk I did for my team members.

Always pull with rebase: http://stevenharman.net/git-pull-with-automatic-rebase

Read more:
- git docs: git-rebase - http://git-scm.com/docs/git-rebase
- git docs: git-merge - http://git-scm.com/docs/git-merge
- git book: Rebasing - http://git-scm.com/book/en/Git-Branching-Rebasing
- git book: Basic Branching and Merging - http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging)

5a5fcbae333f071dc7a28f4958509db5?s=128

Miha Rekar

October 21, 2014
Tweet