2. PHPRunner General questions
  3. Version Control
This topic is locked

Version Control

 		2/11/2013 3:12:26 AM
PHPRunner General questions
T
 Tim author

Good morning!
I'd like to work on a PHPRunner project simultaneously with one or two other developers at different computers. Has anyone had success using a version control software? I'm trying to use github, but even when both developers are working on very different parts of the project there seems to be some conflicts, especially in stylesheets. It would be nice if there was some sort of integrated solution. Any thoughts?
Thanks! Tim
C
 		cgphp 2/11/2013

Check this article: http://xlinesoft.com/blog/2011/06/08/best-practices-multiple-developers-working-on-the-same-project/
T
 		Tim author 2/13/2013

I had seen this, and it works well for two developers on different machines developing at different times. If the developers are developing simultaneously though, as in my case, it seems that there are alot of bad merges due to autogenerated code. Has anyone found a way around this?
Sergey Kornilov admin 2/13/2013

Tim,
incorrect, version control system are designed to support multiple developers working on the same project at the same time.
You should not to merge generated application though, just project files. Take another look at that article to see what files and folders need to be added to source control.