git merge vs git rebase: Avoiding Rebase Hell - Jarrod Spillershttp://www.jarrodspillers.com/2009/08/19/git-merge-vs-git-rebase-avoiding-rebase-hell/

• todo_git
• git

• todo_git
• git

Merge vs rebase