I'm using git-tfs to migrate a TFVC branch (TFS 2013) to a Git repository (TFS 2013). I was able to successfully migrate the complete history using the below command.
git-tfs clone "<<TFS collection URL>>" "<<TFS Trunk branch URL>>" -u=<<username>> -p=<<mypassword>> --export --branches=none .
git remote add origin "URL of new git repository"
git push --all origin
However, as the TFVC branch was actively in use, it has got some more changes after the migration.
I tried to do a delta migration by using the --changeset option which should migrate only the changesets after the specified changeset. Now, git-tfs wouldn't simply let me migrate these new changesets in the existing git repository which was created previously.
I tried a few other options, like migrating to a different folder and then trying to pull from my existing git repo and merging the new changes but it didn't work as git errors out with:
"fatal: refusing to merge unrelated histories"
Any suggestions?
Normally, it's as simple as doing a
git tfs pull
tried to do a delta migration by using the --changeset option which should migrate only the changesets after the specified changeset. Now, git-tfs wouldn't simply let me migrate these new changesets in the existing git repository which was created previously.
I don't know what you mean with that. There is no need of doing that...