On Mon, Jul 29, 2013 at 12:36 PM, Nathan England <[email protected]> wrote:
> > 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? > > I would create the repo on the new server with one of the copies (yours or his, doesn't much matter). Then I'd create a branch for the other copy, then diff that against master to decide what gets merged for the initial state of the new repo. Little bit simpler than Richard's recipe, and I've used this strategy before. -- Alex Esplin /* PLUG: http://plug.org, #utah on irc.freenode.net Unsubscribe: http://plug.org/mailman/options/plug Don't fear the penguin. */
