Thread

Hey guys,

I’m looking for advice from someone with GIT experience.

Currently I manage about 10-20 EE addons using SVN which is really starting to bug me. Theres a bunch of .svn folders floating around and now I’m starting to get some conflicts. I’ve heard on the hype-vine that Git is the new black and I want to give it a try.

I’m trying to setup a new git repo but I’m having trouble deciding how the repo tree will look.

My initial thoughts were to create the repo in a root of an EE site and manage all my extensions as one project. However this seems like a bad idea.

Ideally I would like to manage each addon as a seperate repo so I can export/tag them when a new release is available. The only way I can see this happening is having many git repos in the EE install root. As far as I can tell this will cause conflicts.

So whats the best way to setup the repos?

You’ll also note that I added SVN into the title. I know I have had this dilema with SVN as well.

So how do you manage your addon code?

.svn folders should only exist where there are managed files in a repository.  Are you moving these around with an external tool apart from something that operates on the subversion repository?  And what type of conflicts are you having?

I can’t help you with Git as I’ve not tried it.  Until this year, there wasn’t a bundle for Git in TextMate, which was a dealbreaker.  I’ve since not had the time (or the need, really) to explore it.  If you do try it, please let me know how you like it.

I’ve been on the .git mailing list and had a good response to the problem. I still have to try out the proposed solution but I’ll krrp you posted.

Thanks.  Still curious as to how subversion is failing you though.

Well there is definitely a problem with the process somewhere. I think I first had a conflict when I was rushing and downloaded a folder from my ftp back into the repo. Obviously the .svn folders were then all screwy so I had a couple of conflicts.

The other issue I had was organising the repo. It’s a bit hard to explain but the remote repo had the trunk, tags, branches folders but I only checked out the trunk to my local machine. All the tagging then had to be done on the remote repo so I didn’t mess up my local file system. I know this added to the frustration.

So basically svn didn’t fail me… I failed myself due to the process and setup I was using.

I just thought I would try git to a) try something new b) see if the merging and branching better suited my workflow before I introduced it company wide.