In article <[email protected]>, Marc Sabatella <[email protected]> wrote: > On May 21, 2013, at 3:32 AM, [email protected] (Tony Mountifield) wrote: > > > 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. > > That's good to hear. But I'm curious - do you mean, no conflicts in the > sense that rebase just worked, or no conflicts that it was easy to do by > hand? I still don't have a sense of how smart these tools really are - > or how much we should trust the results of an automatic operation like > this. Trust, but verify? :-)
The rebase just worked. The tools are pretty smart, but will ask you to resolve by hand if the rebase meant that the original edit could no longer match against the rebased starting point. I had to do that with one .ui file, but it was nothing to do with your changes. > > 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. > > That would be great, thanks. But if Werner and/or lasconic decide my > changes need to wait for whatever reason, then you might as well submit > your stuff as is and I will rebase to that. OK, cool. Cheers Tony -- Tony Mountifield Work: [email protected] - http://www.softins.co.uk Play: [email protected] - 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 [email protected] https://lists.sourceforge.net/lists/listinfo/mscore-developer
