[email protected] [~/pi] -> % git checkout master Switched to branch 'master' [email protected] [~/pi] -> % git checkout -b hotfix-1234-git-summit Switched to a new branch 'hotfix-1234-git-summit' [email protected] [~/pi] -> % * always named after ticket number * ALWAYS create off of master branch
• long-running feature branches increase risk of nasty conflicts • best practice is to merge master INTO feature branches EVERY time a production push occurs
• updates code-in-place via ‘git pull’ • runs shell scripts to perform other duties • encourages practice of separate repo for configuration files for your application Whiskey Disk
Branch-and-Merge • allows for parallel development • branching is a “cheap” behaviour • be careful with long-running branches • DON’T CROSS THE STREAMS