In article <519abecf.5010...@outsideshore.com>, Marc Sabatella <m...@outsideshore.com> wrote: > Tony: > > I see you are redo-ing your pull request to separate parenthesized > chords from capo. Do be aware that these hit on some of the same code > areas as my changes. Some of the changes I have made to harmony.cpp > were already merged in as part of my first pull request, but a good > chunk of that code then got updated for the second - the current pending > one. Thus, looking at the master right now will show you the first set > of changes but not the second. I'm, sure we can make it work, but it is > at least potentially awkward to be wedging your two sets of changes in > between mine. > > Speaking selfishly: > > It seems to me that you're going to have to do some work to rebase your > changes anyhow just to pick up my first batch of changes since they are > already in. Given that, waiting for my second batch to get merged to > the master before you create your new branch doesn't make things any > worse for you, but I am pretty sure it would make things easier for me > :-). Or maybe I'm wrong and our code is less intertwined, or the rebase > command smarter, than I am thinking. Or maybe I just need to deal with it. > > Well, just consider this a heads up. I'm certainly open to whatever > anyone else feels makes most sense.
Thanks Marc, yes, I have already rebased my changes to the master that was current yesterday evening (my evening), and there were no conflicts with any of the code you had already committed. I've just looked through your latest pull request, and I think most of it shouldn't conflict, but to be safe, I'll wait until it has been merged (which hopefully won't take too long!), and then rebase my changes to that. I've added a pull request (369) for a small piece of common code that shouldn't conflict with what you've done and will make it easier when I submit my two features separately.. Cheers Tony -- Tony Mountifield Work: t...@softins.co.uk - http://www.softins.co.uk Play: t...@mountifield.org - http://tony.mountifield.org ------------------------------------------------------------------------------ Try New Relic Now & We'll Send You this Cool Shirt New Relic is the only SaaS-based application performance monitoring service that delivers powerful full stack analytics. Optimize and monitor your browser, app, & servers with just a few lines of code. Try New Relic and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may _______________________________________________ Mscore-developer mailing list Mscore-developer@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mscore-developer
