Github is actually my weapon of choice for version control. To be honnest, I’m far to be a pro but I’ve read quite a few pages of documentation, try to use it for two different project and participate to the addon pack.
The latest project we started contained two branches, one for me, one for my partner. We share the same empty folder structure and we have only one common root patch. After working several days, it was time to merge our branches to the Master. And here comes the problem…
Conflict, error… impossible to merge anything and hard to reproduce those problem to understand what was happening. It just didn’t do it and as I’m not really use to the command line yet, hard to say now were is the bug (I’m learning it, I promise).
So my question is, how do you guys manage to use github with lots of patch, subpatches etc. and several guys working on the same project with branches, merge etc… I’m not talking about this : http://nvie.com/posts/a-successful-git-branching-model/
which is more from a strategy point of view. But I’m trying to open a discution about how to use github well while it’s not really designed for XML file and vvvv is a graphical programming environment.
I know some of you are making massive project with massive patch, I guess in such a case the version control has to be done carefully. If we could share some tips and tricks here, that would be really useful, because I believe that a good organisation is the key to create good project.