workflow with multiple people editing same files
This is a bit of a newbie question, but I cannot get clarity on this, and would like some help. At the moment myself and another are working on the same project, committing our changes to beanstalk using Versions each evening. What is the correct process / workflow for committing these files? I am not sure what the 'update' button actually does, does that attempt to merge repository changes of that file with my file and update, or does it overwrite my local file with the repository version? When do I attempt to merge using FileMerge - before / after / nothing to do with the 'update' button? Should I be pressing 'update' to update my entire working directory before attempting to commit any files? Any help would be greatly appreciated, as I have been unable to find any solid documentation on how this works with Versions. --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups Versions group. To post to this group, send email to versions@googlegroups.com To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/versions?hl=en -~--~~~~--~~--~--~---
Re: workflow with multiple people editing same files
That's a very in-depth response, Daniel, thank you! I have read through the links you posted and the main realisation that I have come to is that SVN does the clever stuff like merging, versioning, etc., and Versions app just provides a friendly interface to invoke those clever tools. I have a few followup questions though: 1) why does Versions create 3 extra versions of the file if there is a conflict? They kind of get in the way as I always have to modify the main file and dont look at the .mine, .r19, .r20 ? Can it not just say conflict, here's a fileMerge window for you to create a single file from these two ? 2) every time I 'update' do I need to check the log for which files have been updated and compare changes with files I have modified? I don't see when you would use the 'diff' command, apart from times where there has been a specific conflict that Versions notifies of. 3) If myself and my colleague update and commit regularly as we work on the same project throughout the day and never see a 'conflict' error from Versions, can we assume that at the end of the day our work has been merged in both the repository and our working copies without issue? I think I am getting to grips with it, just trying to clear these things in my head. --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups Versions group. To post to this group, send email to versions@googlegroups.com To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/versions?hl=en -~--~~~~--~~--~--~---
Re: workflow with multiple people editing same files
Forgot one thing - is it generally good practice to commit one file at a time with a comment for each? (obviously there may be exceptions where a group of files should be added at the same time) --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups Versions group. To post to this group, send email to versions@googlegroups.com To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/versions?hl=en -~--~~~~--~~--~--~---
Re: workflow with multiple people editing same files
Thanks for your responses, I think I've made a lot more sense of this now. Just a last one, I have a config.php file that is different on development, staging and live versions and I want to be able to hide or lock or ignore it so that my updates will not try to commit it, even though my local copy is different. At the moment I have to manually select all files one by one, missing out the config.php. Any ideas? --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups Versions group. To post to this group, send email to versions@googlegroups.com To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/versions?hl=en -~--~~~~--~~--~--~---
