Keeping branches up to date can be a pain i.e. pull master into local feature branch then push up to remote feature branch (although gpp command in the preszto

Keeping branches up to date can be a pain i.e. pull master into local feature branch then push up to remote feature branch (although gpp command in the preszto git module gets around this a little but you still need to update your working copy https://github.com/sorin-ionescu/prezto/tree/master/modules/git https://github.com/sorin-ionescu/prezto/tree/master/modules/...) BUT separate steps for this is good because it allows for better inspection and the ability to recover