On 01/18/2014 05:16 PM, Tobias Doerffel wrote: > Hi, > > next time please just merge the stable-0.4 branch because if doing > lots of changes manually in different branches it can become > complicated when merging back to stable-0.4 later (Git possibly can't > recognize common commits) > > Toby
Yeah, I rebased on stable-0.4 and when it threw a conflict I rewrote history by entirely removing the commit with the peak controller changes from the UI branch. So it should be ok, the UI branch should be synced with upstream. ------------------------------------------------------------------------------ CenturyLink Cloud: The Leader in Enterprise Cloud Services. Learn Why More Businesses Are Choosing CenturyLink Cloud For Critical Workloads, Development Environments & Everything In Between. Get a Quote or Start a Free Trial Today. http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk _______________________________________________ LMMS-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/lmms-devel
