Regarding your snippets below:
Would this really be something you want? Your ongoing work merged into everyone else's ongoing work every day - before your work is finished and tested? I approached the whole concept of items being checked out to others differently - you can take a branch copy, but the idea of a branch copy is that it branches from the root - the live version, I guess. Each person can work on their branch, but one gets tested and goes live separately from the other - unless you choose to combine the projects. Also went down the road of automatically merging work in a program done by two different people for two different reasons. It can be fraught with error - at least in my experience. It needs human eyes to decide what goes where! Depending on the complexity of the changes, I guess. We overcame the problem of someone coming along later with a higher priority project by allowing the branches to be swapped out, so the first programmer does not have to check-in/lose their work. Lots of ways to skin this cat, I have learned over the years. Susan Message: 15 Date: Fri, 04 Mar 2011 10:42:58 +0000 From: Wols Lists <[email protected]> And the nice thing is, every time you change branch, or every morning or whatever, you can do a "pull; merge" and you're development copy keeps in sync with all the changes every one else is making. But I would say, even if no-one else in your organisation is using it, it's a damn good tool for you to use for your own work. If you've got several people working on a centralised VCS, I've had enough pain where we've been tripping over each other trying to update the same file. You can have a master branch tracking the central system, then do your own development in your own branches. When you need to commit, sync your master with central, check out central, merge your changes into your master, then commit back to central. That way, you're not held up because you can't check out a file, and you're not swearing when you're half way through make a LOT of not-so-important changes, and someone comes along saying "you need to check that back in, I've got an emergency to fix!". I'd say play with git! It's a nice system, and there's absolutely no need whatsoever for it to impact on anybody else around you, unless you want it to. And other people will probably start using it too, once you realise how nice and powerful it is. Cheers, Wol _______________________________________________ U2-Users mailing list [email protected] http://listserver.u2ug.org/mailman/listinfo/u2-users
