Blog Archive

Tuesday, August 12, 2014

Git Branching Strategy

Pull = update your feature branch or local copy before commit/merge.
Fetch = update local master, not your branch
Fast Forward != merge
Merge = heavies and post feature development

Rebase = Complicated, carry history, Pull down code relative to upstream/mster.


Three rebase Scenarios

No comments: