[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 s

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

2013-07-02 Thread jaykav47
Hi, I'm having difficulty understanding how I should use git when I have multiple independent changes in a project. I have a local git repository for various windows & linux machines and I work on different parts of the project on different machines. The situation I have is that I am part way