Elysian Shadows

Working teams has always been a challenge in some form or another. While there can't be much done on a technical level for the clashing of heads, there are some things you can do to make some of the logistical aspects go by easier.

Here are some of the things I have done at work to make life easier.

Firstly if you are going to be working in a team you want the process of sharing the code base to be as seamless as possible. If you are in an environment where you cannot have it on a public server, and you dont really want to pay the premium for having your repo's be private, you can use something like gitolite https://github.com/sitaramc/gitolite/

It is very easy to setup, and is very versatile.

Secondly, you want a well defined development cycle and more specifically how you use your source tree. If you are going to use something like git, I recommend looking at this article.

http://nvie.com/posts/a-successful-git-branching-model/

That looks like a really interesting read. I'll have to save it for when I have the time to read it thoroughly.

Thanks for the post avansc, I am definitely glad I have this as a reference. I read the whole thing, and I recommend others do as well.

Id also like to add a few things, well 2 for now, that you might want to look into regarding git, its a bit more advanced and some teams, especially really small ones (1-3 people) might not need or benefit from it.

'git cherry-pick' is awesome especially when you merge branches where the code base has changed a lot. it makes something like svn look primitive. To quote Linus on gits merging.

It's a bird … it's a plane … no, it's KernelMan, faster than a speeding bullet, to your rescue. Doing new kernel versions in under 5 seconds flat …

Thats something like 20k+ files. anyways.

The other thing was look into git mirroring, especially if you have people across the world working on a project, it speeds things up significantly.

Here is a neat little site that I found, It covers a fair amount. http://gitready.com/

I think a Posts like this should be stickied.
Maybe make it a Full length post sooner or later.

Just something to add: Nvie's branching model is one end of the spectrum, while something like GitHub's Flow could be more suitable for some groups.