Re: [git-users] Re: How to deal with concurrent changes in a project

2013-07-04 Thread Philip Oakley
It is easy to use Git 'the wrong way' when transferring over from other styles of version control. Most old styles of version control (including what most people think in their head) have a master-slave copy viewpoint. This assumes that there is a single 'master' (both the respository and its

[git-users] Re: How to deal with concurrent changes in a project

2013-07-03 Thread jaykav47
Just to be clear: - I am not using github - I have set up a git server on a local machine. It works fine. - I have a single repository on the server. - There are currently 5 clients (mix of windows, linux and osx) Thanks for the suggestions but they do seem to be quite complex given that this