armtuk

So, I had two version of the eastcoastmarine repository, one with version history from svn imported, one without, that was just an import of the raw data. I had made modifications to the second one, but want to merge them. with git, this was a piece of cake. I added the second as a remote repository to the first. Copied the remote branch down, and then merged it. There were a few add/add conflicts, but all in all it went very smoothly. Now I have a repo with a full history of the project including all the recent changes. All I have to do now is clone it to my server so I have a backup. This takes a bit because the repo is pretty big (>5gig) lots and lots of photos and data.