for future reference though you can actually rebase a patch against a
particular branch or do as you did fix the merge conflicts
On Sun, Jun 22, 2014 at 7:30 PM, Vesa <dii....@nbl.fi> wrote:
> On 06/22/2014 12:39 AM, Tobias Doerffel wrote:
> > Hi,
> >
> > just merged stable branches so everything should be up-to-date now
> > again. Thinks also still seem to build fine even though I didn't test
> > for functionality.
>
> Ok, I see that the logscale patches aren't merged in master, so how do
> we handle this? Since those commits are pretty much a guaranteed merge
> conflict... Should I port the changes to master manually with another
> commit, or...?
>
>
> ------------------------------------------------------------------------------
> HPCC Systems Open Source Big Data Platform from LexisNexis Risk Solutions
> Find What Matters Most in Your Big Data with HPCC Systems
> Open Source. Fast. Scalable. Simple. Ideal for Dirty Data.
> Leverages Graph Analysis for Fast Processing & Easy Data Exploration
> http://p.sf.net/sfu/hpccsystems
> _______________________________________________
> LMMS-devel mailing list
> LMMS-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/lmms-devel
>
--
Jonathan Aquilina
------------------------------------------------------------------------------
Open source business process management suite built on Java and Eclipse
Turn processes into business applications with Bonita BPM Community Edition
Quickly connect people, data, and systems into organized workflows
Winner of BOSSIE, CODIE, OW2 and Gartner awards
http://p.sf.net/sfu/Bonitasoft
_______________________________________________
LMMS-devel mailing list
LMMS-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/lmms-devel
