I have been using git with sourcetree on windows for a few months now and had some questions that i figured would be better asked here than yahoo answers. I am using git with sourcetree for my project, so my first question is this:
How many branches do you normally have? I currently have 4, Master, Development, Working(for uploading builds in progress) and Release. Should I have more branches? I only have 1 other person helping me, but what if i had like 4 or 5? do they all have their own branches? What if they edit the same files and push to the same branch? whos files get overwritten?
I usually push to the working branch once in a while while im in an active editing session, then when i’m done with all the changes i want I merge to Development, and when the game gets to a milestone I merge to Master, is this a good workflow?