Andrew at 27.06.2011 13:27, Andrew wrote: > 27.06.2011 14:20, Erich Titl пишет: ..
> Yes. If fixes are placed in 4.0-fixes, rebasing master from 4.0 tag to > latest commit in 4.0-fixes should add all fixes into master (and other > branches that are splitted from master later than 4.0 tagged commit). And overwrites possibly better solutions in master. I am considering master to be the evolutionary branch and any ...fix as a temporary, so I would probably prefer a clean merge. But these may be syntactical issues. cheers Erich
smime.p7s
Description: S/MIME Cryptographic Signature
------------------------------------------------------------------------------ All of the data generated in your IT infrastructure is seriously valuable. Why? It contains a definitive record of application performance, security threats, fraudulent activity, and more. Splunk takes this data and makes sense of it. IT sense. And common sense. http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel