Hello! A consultant and I have been working on a code base together using github for some time. We realized about a month ago that several files contained extremely sensitive data and it was not wise to keep it on github. So I deleted the github account and all the data with it.
We now have to mildly differing code bases. I need to create a new git repository, which I have created on a server we both have access to. Now the trick is to merge our two code bases and create an initial commit. I would like your opinions or advice on the best way to merge these and create a new repo. I'm seriously new to git and not sure if I could just setup my code and then create a new branch, delete everything in it and copy his data in, then merge it to my master? How should I do this? Thanks! -- Regards, Nathan England /* PLUG: http://plug.org, #utah on irc.freenode.net Unsubscribe: http://plug.org/mailman/options/plug Don't fear the penguin. */
