RE: Can I retrospectively merge an old Git repo with a new one ?

Sorry, that was obviously a TortoiseGit issue (not Svn). Getting my tortoises mixed up…

Apologies for the noise,
Regards,
Richard.

PS. And also apologies if this comes through twice - I seem to be having mail sending problems.

Richard Kerry
BNCS Engineer, SI SOL Telco & Media Vertical Practice

T: +44 (0)20 3618 2669
M: +44 (0)7812 325518
Lync: +44 (0) 20 3618 0778
Room G300, Stadium House, Wood Lane, London, W12 7TA
richard.kerry_at_atos.net<mailto:richard.kerry_at_atos.net>

[cid:image002.png_at_01D2A2FB.BCF50170]

From: Kerry, Richard
Sent: Tuesday, March 21, 2017 3:41 PM
To: users_at_tortoisesvn.tigris.org
Subject: Can I retrospectively merge an old Git repo with a new one ?

I have just recently tried to change a Git project (ie repo) into a server. To get started with this, as it’s the first one I’ve done, I’m using the local protocol, ie the new repo is a file folder, cloned from the existing project using “clone into bare repo”.
I’ve then cloned that (ie checked out) into a new folder and it seems to have worked – files are as expected.

This project has a bit of history, but up to now I’ve just made copies of the whole project folder and copied that around to work on. I’d like now to point those existing copied projects at my new, cloned, bare repo version. Can I do that ? Or do I need to check-out/clone it and start again and manually merge existing files ?

In other words what I think I’d like to do is to take a project which has been stand-alone, ie it has nothing to point to a remote repository, and tell it that it should in fact have a remote repository reference, with which it can then be merged/synchronized (either way) ?

I hope that makes sense,
Regards,
Richard.

Richard Kerry
BNCS Engineer, SI SOL Telco & Media Vertical Practice

T: +44 (0)20 3618 2669
M: +44 (0)7812 325518
Lync: +44 (0) 20 3618 0778
Room G300, Stadium House, Wood Lane, London, W12 7TA
richard.kerry_at_atos.net<mailto:richard.kerry_at_atos.net>

[cid:image002.png_at_01D2A2FB.BCF50170]

Atos, Atos Consulting, Worldline and Canopy The Open Cloud Company are trading names used by the Atos group. The following trading entities are registered in England and Wales: Atos IT Services UK Limited (registered number 01245534), Atos Consulting Limited (registered number 04312380), Atos Worldline UK Limited (registered number 08514184) and Canopy The Open Cloud Company Limited (registration number 08011902). The registered office for each is at 4 Triton Square, Regent’s Place, London, NW1 3HG.The VAT No. for each is: GB232327983.

This e-mail and the documents attached are confidential and intended solely for the addressee, and may contain confidential or privileged information. If you receive this e-mail in error, you are not authorised to copy, disclose, use or retain it. Please notify the sender immediately and delete this email from your systems. As emails may be intercepted, amended or lost, they are not secure. Atos therefore can accept no liability for any errors or their content. Although Atos endeavours to maintain a virus-free network, we do not warrant that this transmission is virus-free and can accept no liability for any damages resulting from any virus transmitted. The risks are deemed to be accepted by everyone who communicates with Atos by email.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3222699

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].