Version Control - Git

Comprehensive Tutorial

• Pro Git

• Atlassian: Become a git guru. | Advanced Git

• git-scm reference

• Think Like (a) Git - A GUIDE FOR THE PERPLEXED

Tips & Cheatsheet

• git-tips

• Interactive Visual Git Cheat Sheet

• GitHub Git Cheat Sheet

Git Workflow and Branching Model

GitFlow

Image Source: http://nvie.com/posts/a-successful-git-branching-model/

• Visual Tutorial: Understanding the GitHub Flow

• A successful Git branching model By Vincent Driessen

• Understanding the Git Workflow

• GitHub Flow

Rethink GitFlow or "Anti-GitFlow"

• GitFlow considered harmful
• Follow-up to 'GitFlow considered harmful'

GitFlow's Mistakes

• It makes the project's history completely unreadable

• The master/develop split is redundant

• It's needlessly complex

About rebase, merge and cherry-pick

• StackOverflow: Git Cherry-pick vs Merge Workflow
• Merging vs. Rebasing

More about merge

• Live to merge, merge to live...

Subtree vs Submodule

• The power of Git subtree
• Alternatives To Git Submodule: Git Subtree