From: Vesa <di...@nb...> - 2014-01-18 15:32:24
|
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. |