Git Workflow and Best Practices
How we use git at Shopify - Shopify

How we use git at Shopify - Shopify

8/24/2011

What this post added

This post details a specific Git workflow used at Shopify, including repository forking, feature branch usage, remote setup (origin, mainline), and branch management (production, staging, master). It explains daily usage patterns for updating feature branches, pushing to staging, and merging into master and production. It also provides tips on rebasing for cleaner history, squashing commits, unstaging, amending, reverting, and bisecting.

Read the original post ↗