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
    • checkout the development branch, then pull it to get current
    • re-checkout your new feature branch
    • use gitflow ‘finish current’ (set to ‘delete branch’ and ‘force delete’)
    • merge conflict message, go to working copy, right click resolve conflicts – launch external merge tool, choose resolution, file save merge, quit merge tool (do not quit merge tool until you’re done with all merges
    • commit and push merge results
    • now push the new dev branch
  • if there are no merge issues then just push the new dev branch up to the remote origin
• push develop changes up to remote (if not done already)
• check github site to confirm your changes are present (just until you are comfortable with this process)