Main menu

Monthly Archives: February 2015

I’m using github for a large project with multiple developers – there have been a few wrinkles using the github mac client so we switched to SourceTree – a free github client. We’re using it to implement gitflow – I’ve been very happy with it so far – below is our process…

<>

Before you start a new feature

make sure you have the latest copy of the dev branch (do a fetch on remote, then pull if dev branch shows any changes)

use gitflow command ‘new feature’ and name it

make your changes to code

stage files, then commit and push all changes to your feature branch

before finishing feature (merging with development) – use fetch to check status of development branch,

if there have been commits by other members of the team since you downloaded the development branch you will need to merge those changes to your feature branch before finishing the feature