Add new comment

Robbie Mackay (not verified)

Sun, 16/11/2014 - 21:05

Nice write up.

I think the important bit when figuring out git workflows is to get something that fits. First figure out 1. are you trying to get a git workflow that fits your current process? or does your current development process have issues you need to fix too?

Git is intentionally flexible. Forcing yourself to follow git-flow when you don't really have 'releases' doesn't make sense. Tweak your branches to match bits of your workflow that already exist:

  • We branch for features and bugs .. because we already treat those as separate work (tasks in a tracker)
  • Merges really represent code reviews. The important bit is the review, the merge is just an implementation detail.

If you don't do code review.. maybe adding branches is a chance to add some review process?

There is no perfect workflow, largely because you have to make it up for each team.