Tag Archives: Co Employees

We live switching to the SVN (Subversion) variant control system at the job: we have our own local working duplicates, and the live server is definitely another working copy in the same repository. It works great, but there’s a problem that caused an enormous stir about weekly ago that pretty much caused an apocalypse. That scenario: Somebody edits a file to the live server without under-going SVN (i. e., they FTP it or something). Somebody employs the right workflow in addition to edits the document on his community working copy and commits it. Yet another person runs on your live server to help update the file towards latest in your repository. What occurs is, instead in the update failing because of the two files come in conflict, SVN will take it upon by itself to just merge the 2 main files and create a diff of the effect. That’s all good and good, but most are PHP files over a live site, so the merge actually results in syntax errors in the file. The only fast solution is to delete the actual working copy’s file and redo that update, which just gives the version in the repository back with. So, … Continue reading →