GIT Version Control

[gkm]

Keep in mind that if the OP works in a corporate environment or work on any kind of "sensitive" work they'll mist likely never be allowed to host their code anywhere that is not inside their network.

I am not convinced that "on-site" is always more secure (in terms of http://en.wikipedia.org/wiki/Information_security). OP does not sound like they have a lot of infrastructure, then outsourcing your source control may be safer, in terms of the combination of ensuring both non-disclosure and availability.

 

[sutekj]

GitLab is a great way to get started with Git. You can install it to a local server if you don't want to commit all your code to the cloud.

Check it out here: https://about.gitlab.com/installation/

There is also an awesome OpenVZ template, if you run OpenVZ VM's anywhere in your company: http://www.turnkeylinux.org/gitlab

I think GitLab might make it too complicated for you if you're not yet used to any version control. If your team is smaller than 5, then start with BitBucket.

 

[shiram]

If your team is smaller than 5, then start with BitBucket.

+1 for BitBucket. We set up groups of teams for different projects when doing cross-company collaboration. Most projects stay under five developers.

 

[DRou]

Has anyone ever managed to incorporate check-in/check-out functionality while using Github?
I accept that Github wasn't designed for that, however it can be really handy.

I actually tried incorporating TFS and Github, so that I could have TFS's check-in/out notifications, and Github's features but I was taking long so I had to stop that.

We've been managing with no check-in/out notifications, but when we get more developers on board then it wouldn't hurt to have such a feature.

 

[_kabal_]

Checkin/checkout is a relic from when these vcs had no merge tracking...

 

[gkm]

Yes, you probably want to use feature branches with merging instead, if I understand correctly what you are trying to achieve.