27.06.2011 12:06, Erich Titl пишет: > Andrew > > at 27.06.2011 10:33, Andrew wrote: > ... >> Yes, patches from commits now are applied mostly manually - due to >> different dir structure. But possible 'git rebase' on stable branch >> should be successful - so if changes are placed in stable bugfix branch, >> master branch (and other branches) can be rebased and changes are merged >> into it. > Looking at the rebase diagrams proves you wrong IMHO. Rebasing attaches > modifications to a different point in time in the main branch, it does > not merge these modifications into the main branch. So modifications mad > in another branch must be merged into the main branch should they need > to be permanent. > > So the usage of ....fixed branches are somehow doubtful if they are nor > merged. > > cheers > > Erich > 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 :)
------------------------------------------------------------------------------ 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
