On 05/12/2014 09:10 PM, Vesa wrote: > On 05/12/2014 09:06 PM, Tobias Doerffel wrote: >> In order to build the current master branch I recommend to do a clean >> clone as otherwise you have to deinit and remove the ZynAddSubFX >> submodule manually. > What about forks? I mainly use my own fork for building master, since > it's more convenient for me that way... can I just do a rebase on it > like usual or are additional steps needed? >
I'm asking mainly because I have unfinished work in branches in my fork, and simply deleting the whole thing and starting from scratch isn't really an option... Furthermore, "git submodule deinit" doesn't seem to be working, seems like my version of git is too old and doesn't have that command at all... now the files in the old submodule conflict with the changes in the master branch so I can't rebase, but removing those files registers as a change which again prevents me from rebasing... ------------------------------------------------------------------------------ "Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE Instantly run your Selenium tests across 300+ browser/OS combos. Get unparalleled scalability from the best Selenium testing platform available Simple to use. Nothing to install. Get started now for free." http://p.sf.net/sfu/SauceLabs _______________________________________________ LMMS-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/lmms-devel
