Re: [git-users] Branches and workflow

2013-05-24 Thread Alex Lewis
I'd agree branching is all that and should be the way to do development, it's more of a question of *how many* branches you go with and being sensible about it. As your branch count proliferates then it can become more complicated to keep track of what is going on, what's being done where,

[git-users] Re: 3 servers git workflow help needed: Development-Testing-Production

2013-05-24 Thread Bruno Cassol
Thanks for your reply! We are currently not using branching in git. Perhaps that's why I tried to map different branches in different servers/repos in my mind. I'm afraid the team lacks experience with distributed version control in general. I guess we will need to sit down and learn git so we

Re: [git-users] Re: 3 servers git workflow help needed: Development-Testing-Production

2013-05-24 Thread Philip Oakley
You can always have a look at how git itself is 'managed' in terms of its branches that Junio (maintainer) integrates. That is, he has lots of sub-branches for each contributer's patch series that are merged into 'pu' (potential updates) at various points (and rewound when they are updated or

Re: [git-users] 3 servers git workflow help needed: Development-Testing-Production

2013-05-24 Thread Yawar Amin
Hi, On 2013-05-24 09:33, Bruno Cassol wrote: Hi, we have the following setup and I would like advice/help. I'm not even sure if this the correct setup. DEVELOPERS WORKSTATIONS (Windows/TortoiseGit) c:\xamp\htdocs\intranet/ | | push / pull V DEV (CentOS/ssh) /home/git/repos/intranet/