On Apr 10, 3:25 am, pepe <p...@betterrpg.com> wrote: > Hello, > > I'm sorry if this is not the right place for this question. Please > feel free to point me in the right direction. > > Also take into consideration that we have never used a version control > system so my questions might just be due to lack of knowledge and/or > understanding as of how to use the VCS. > > Is there a version control system (be it git, TortoiseSVN, other...) > that will be able to take care of the following scenario? > > Having a 'vanilla' version of an application we have 3 customers, each > with enough changes to their version of the application that no > version can be merged back to the vanilla one, hence ending up with 4 > versions: the vanilla one plus 3 others, one per customer. > > We need a VCS that will allow us to make changes to the main 'vanilla' > version and propagate those changes to the other versions and, better > yet, to propagate those changes selectively, meaning to only 1, or 2, > or the 3 other versions on demand. >
git is pretty smart at merging stuff between branches (way more so than svn which would end up being a bit of a nightmare in this case). I'd bear in mind that even with git helping you you are increasing your maintenance burden significantly - everytime you add a new feature or fix a bug you need to be taking into account the 4 variations of the app and how the differences between them might interact with the change you're making. If you can manage it it may make your life easier to keep one codebase but make each deployment of your app more configurable. Fred -- You received this message because you are subscribed to the Google Groups "Ruby on Rails: Talk" group. To post to this group, send email to rubyonrails-t...@googlegroups.com. To unsubscribe from this group, send email to rubyonrails-talk+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/rubyonrails-talk?hl=en.
