Paul McGrath

 Speedy Input  Speedy Visualisation  Speedy Workflow

 git push master~2:master  git pull –rebase  (git fetch origin, git rebase origin/master)

 Interactive rebase (rebase –i)

 In ~/.bashrc and ~/bin  My editor is much easier to use for interactive rebase, commit –amend etc.  Share your setup – it’s all config files

 ~/.bashrc:

 Features tied together  Can’t unpick the log  Branching from untested code  Your product is the sum of independent features  Features can be easily removed  You have a safe point to branch from

 Git docs: Branching strategy ( scm.com/book/en/v2/Git-Branching-Branching- Workflows) scm.com/book/en/v2/Git-Branching-Branching- Workflows

 flow.html flow.html  git merge develop  Keep it as light-weight as possible  …Yeah, but what about conflicts? DEVELOP MASTER MY LOVELY FEATURE

 Avoiding conflicts  Small commits  merge safe point into branches  Even better… rebase!  …Yeah, but I don’t want to see all these branches all over our repo…