2013/9/27 d/j/a/y is free <[email protected]>: > Le 27/09/2013 10:22, Carlos is free a écrit : >> Regarding to the branch to use, .... >> > Yu what any advice ? > > In order to have an idea, i have cloned /jcome/sfg/menubar_toolbar, and > merge it with sfg/master quite easily ... just a few conflict resolution > ( termonilogy change , bones action). and build ok.
Yes, menubar_toolbar looks fine for me. But merging it is not a good idea - you will get the non-linear history and it will turn into complete mess. So, I completely agree with Carlos - it's better to cherry-pick commits one-by-one on top of your branch. Alternatively you can do rebase (result will be the same, but you will not be able to exclude particular commits). K. -- http://morevnaproject.org/ ------------------------------------------------------------------------------ October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60133471&iu=/4140/ostg.clktrk _______________________________________________ Synfig-devl mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/synfig-devl
