> > Would be an interesting experiment to see how often it blows up :) > > As soon as the branch really becomes warranted since you start to do > serious new development on HEAD. 8-) The merge will probably only > ever be possible without conflicts when you wouldn't need a branch > anyway.
Not necessarily. Quite often a bugfix on a branch will occur somewhere that HEAD hasn't been touched, so it will apply seamlessly. It's not like the merge needs to go the other way :) Once a conflict occurs, a manual merge can be done to resolve it and the branch tagged so that future merges can be done from that tag onwards. anyway, probably something more suited to another list :) Cheers, Brett --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
