We have an ongoing conversation about the best way to manage our code-base and repository in Git and have found the best solution is by using this branching structure:
Some comments from our developers and friends:
Yes. Basically, we should be checking in only code that works to 'develop'. If you need to save your latest progress, you should just create your local git branches as many as you like and when you are ready, merge with your local 'develop' branch and then push the changes to the remote 'develop' repo.
We've been using git-flow at ShortForm for about a year now an we love it. The gitflow extensions are also very nice, save a lot of manual branching and tagging as per the process :
There have also been a few moments where the process has broken down for us, but with git it's so easy to do things manually as well that it has not held us back in any way.