Am 06.01.2012 16:52, schrieb Eugene Arshinov:
Hi Thomas,
Thanks for the reply. If I can't preserve merges anyway, I'm going to transfer the sm branch right from my existing local Git repository. That is,
- I will fork the main repository and clone it
- add existing local repository as a remote
- rebase the sm branch from the remote onto the corresponding commit cloned from the fork.
I guess, this should work.
I dont think you can add the local repository as a remote (I am assuming that local repo is a git-svn repo from before the conversion) as the history is different. The history needs to be the same so git can reasonable tell which commits need to be rebased.
Are you saying that the sm branch in [1] is out of date and you would rather use what you have locally?
Best regards