27.06.2011 14:20, Erich Titl пишет: > Hi Andrew > > at 27.06.2011 11:14, Andrew wrote: > ... >> There is no difference metween 'master' branch and any other - so if >> some branch can be rebased to different commit of master, also master >> can be rebased to different commit of some branch :) > So your solution would be to rebase master to a whatever branch to pull > in the fixes. I don't know if that is the canonical way. > > cheers > > Erich > 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).
------------------------------------------------------------------------------ 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
