From: Jonathan W. <jw...@ju...> - 2012-09-26 01:44:43
|
Hi Phil > > At some point could you do an "svn update" to pull in the svn version of > > saffire_pro14.{cpp,h}? Your diffs involving these two files are showing up > > with a 1 line offset, most likely because your local copy doesn't include > > the copyright lines I added on your behalf. > > Sorry. I use the git repository; so I have to learn how to update from > svn. That's fine; at least in theory the git repo should sync up with svn and then allow you to sync with it. Now Adrian's done his resync thing again this may happen as a matter of course - all you should need to do is do the git equivalent of an "svn update" (which I think is "git pull" or something like it). Regards jonathan |