Marc Slemko wrote: > On Fri, 30 Aug 2002, Ian Holsman wrote: > > >>exactly, >>this talk of 2.1/branching etc is very premature. >>if you think your going to destablize the tree, then do your changes on >>a copy of the file.. and when your done just overwrite the old one. > > > In preference to doing that, just create a temporary branch for > those changes, develop and stabilize them on the branch, then merge > them back into the main tree when ready. Sure, some problems won't > be found until they are merged back but this does allow interested > developers to work together and test on that branch. > > Note that this requires either only branching the files you are > working with and hoping that is all you have to change, or merging > all other changes in other files into your branch as you go so the code > you are working with is up to date with the head. Neither are likely > to be big time sinks if the changes are reasonably isolated. >
EXACTLY. branch your code, make it work, merge it back. rinse repeat. what could be simpler than this ? as long as your merge is done quickly (1-2 weeks) and is well-defined you should be good to go.
