[Lmuse-developer] Jack midi - Let's get that code in there. Want to merge here first to try, need advice

[Tim E. R. <ter...@ro...>]

Had some time to play with the Jack midi branch.
Plays fine. No work has been done for a few weeks.

We need to get that code in there before 
 *I* screw things up. My fault. I missed the beat.
I'm steaming full ahead with patches thinking 
 Larry's going to 'follow along' with a parallel build, 
 when I should have recommended merging 
 *immediately* after that first release, so that 
 a) we can all work on the main branch,
 b) *I* don't diverge the branches too much. 

If we just directly merge Larry's code with SVN,
 there might be conflicts. How do we do this?
Maybe one of three things need to happen: 
a) Larry merges the latest SVN with his GIT and builds
 and tests. If it at least builds, let's get that code 
 back into the SVN.
b) I locally merge his GIT with my local SVN
    (Is that even possible?).
    Build, test, and commit back to the SVN.
c) We take our chances with a direct merge of GIT to SVN.
 
I don't know how much time he has so I can try b).
** I need some advice. Don't know much about SVN, GIT.
Can you tell me how I might merge the GIT with
 my local copy of SVN?

Tim.