Skip to content

Instantly share code, notes, and snippets.

View ohenley's full-sized avatar
🦄
happy

olivier henley ohenley

🦄
happy
  • Saint-Calixte-de-Kilkenny
View GitHub Profile
@nicholashagen
nicholashagen / gist:2855167
Created June 1, 2012 21:12
Git Rebase/Merge Workflow

Git Workflow for Feature Branches

The following is an example workflow for developing on a temporary branch and merging back to the main branch squashing all commits into a single commit. This assumes you already have a branch named branch-xyz and have finished the work on that branch.

Step 1: Checkout the feature branch

git checkout branch-xyz