On 06/24/2014 09:03 AM, Jonathan Aquilina wrote:
> for future reference though  you can actually rebase a patch against a
> particular branch

Yeah, but if I had done that, what would have happened next time we
merged 1.1 -> master? Then the merge conflict would still be there...
guess we could have just skipped the commit then, but I figured it was
easier to deal with it this way.

------------------------------------------------------------------------------
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

Reply via email to