How Can I Bring In Changes To Git From TFS Since The Git Repository Was Created?
We have an application which used TFS for source control.
We switched to Git and brought the code over from TFS.
Some development then took place and new changes were checked into TFS.
There have been no changes made yet in Git.
How can I now update the Git source with the changes in TFS?
git tfs
edited Nov 13 '18 at 22:08
CodeWizard
52.9k127096
asked Nov 13 '18 at 19:59
DaveBDaveB
7,84833255
|
show 1 more comment
We have an application which used TFS for source control.
We switched to Git and brought the code over from TFS.
Some development then took place and new changes were checked into TFS.
There have been no changes made yet in Git.
How can I now update the Git source with the changes in TFS?
git tfs
edited Nov 13 '18 at 22:08
CodeWizard
52.9k127096
asked Nov 13 '18 at 19:59
DaveBDaveB
7,84833255
docs.microsoft.com/en-us/azure/devops/repos/git/…
– CodeWizard
Nov 13 '18 at 22:09
Redo the git migration? Reapply the changes to the existing git codebase?
– DeanOC
Nov 13 '18 at 22:14
When you say you used TFS for source code - do you mean TFVC (Team Foundation Version Control) or just used TFS to host your Central Git Repo?
– DaveShaw
Nov 13 '18 at 22:22
TFVC - I didn't use TFS to host Central Git Repo.
– DaveB
Nov 13 '18 at 23:03
How did you do your migration? With 'git-tfs'? Or just copying the files?
– Philippe
Nov 13 '18 at 23:59
|
show 1 more comment
We have an application which used TFS for source control.
We switched to Git and brought the code over from TFS.
Some development then took place and new changes were checked into TFS.
There have been no changes made yet in Git.
How can I now update the Git source with the changes in TFS?
git tfs
edited Nov 13 '18 at 22:08
CodeWizard
52.9k127096
asked Nov 13 '18 at 19:59
DaveBDaveB
7,84833255
We have an application which used TFS for source control.
We switched to Git and brought the code over from TFS.
Some development then took place and new changes were checked into TFS.
There have been no changes made yet in Git.
How can I now update the Git source with the changes in TFS?
git tfs
git tfs
edited Nov 13 '18 at 22:08
CodeWizard
52.9k127096
asked Nov 13 '18 at 19:59
DaveBDaveB
7,84833255
edited Nov 13 '18 at 22:08
CodeWizard
52.9k127096
asked Nov 13 '18 at 19:59
DaveBDaveB
7,84833255
edited Nov 13 '18 at 22:08
CodeWizard
52.9k127096
edited Nov 13 '18 at 22:08
CodeWizard
52.9k127096
edited Nov 13 '18 at 22:08
CodeWizard
52.9k127096
52.9k127096
asked Nov 13 '18 at 19:59
DaveBDaveB
7,84833255
asked Nov 13 '18 at 19:59
DaveBDaveB
7,84833255
asked Nov 13 '18 at 19:59
DaveBDaveB
7,84833255
7,84833255
docs.microsoft.com/en-us/azure/devops/repos/git/…
– CodeWizard
Nov 13 '18 at 22:09
Redo the git migration? Reapply the changes to the existing git codebase?
– DeanOC
Nov 13 '18 at 22:14
When you say you used TFS for source code - do you mean TFVC (Team Foundation Version Control) or just used TFS to host your Central Git Repo?
– DaveShaw
Nov 13 '18 at 22:22
TFVC - I didn't use TFS to host Central Git Repo.
– DaveB
Nov 13 '18 at 23:03
How did you do your migration? With 'git-tfs'? Or just copying the files?
– Philippe
Nov 13 '18 at 23:59
|
show 1 more comment
docs.microsoft.com/en-us/azure/devops/repos/git/…
– CodeWizard
Nov 13 '18 at 22:09
Redo the git migration? Reapply the changes to the existing git codebase?
– DeanOC
Nov 13 '18 at 22:14
When you say you used TFS for source code - do you mean TFVC (Team Foundation Version Control) or just used TFS to host your Central Git Repo?
– DaveShaw
Nov 13 '18 at 22:22
TFVC - I didn't use TFS to host Central Git Repo.
– DaveB
Nov 13 '18 at 23:03
How did you do your migration? With 'git-tfs'? Or just copying the files?
– Philippe
Nov 13 '18 at 23:59
docs.microsoft.com/en-us/azure/devops/repos/git/…
– CodeWizard
Nov 13 '18 at 22:09
docs.microsoft.com/en-us/azure/devops/repos/git/…
– CodeWizard
Nov 13 '18 at 22:09
Redo the git migration? Reapply the changes to the existing git codebase?
– DeanOC
Nov 13 '18 at 22:14
Redo the git migration? Reapply the changes to the existing git codebase?
– DeanOC
Nov 13 '18 at 22:14
When you say you used TFS for source code - do you mean TFVC (Team Foundation Version Control) or just used TFS to host your Central Git Repo?
– DaveShaw
Nov 13 '18 at 22:22
When you say you used TFS for source code - do you mean TFVC (Team Foundation Version Control) or just used TFS to host your Central Git Repo?
– DaveShaw
Nov 13 '18 at 22:22
TFVC - I didn't use TFS to host Central Git Repo.
– DaveB
Nov 13 '18 at 23:03
TFVC - I didn't use TFS to host Central Git Repo.
– DaveB
Nov 13 '18 at 23:03
How did you do your migration? With 'git-tfs'? Or just copying the files?
– Philippe
Nov 13 '18 at 23:59
How did you do your migration? With 'git-tfs'? Or just copying the files?
– Philippe
Nov 13 '18 at 23:59
|
show 1 more comment
1 Answer
1
active
oldest
votes
After you migrate from TFVC to GIT the best practice is to lock the TFVC repo and NOT keep working on him.
But if you didn't lock and some people did a check-in with new code to TFVC, you can use the tool git-tfs (I guess you used him for the migration) to pull the changes from TFVC to your new Git repo.
The command is: git-tfs pull [options]
The pull command fetches TFS changesets (like the fetch command) and merges (or rebase using r option) the current branch with the commits fetched (creation of a merge commit or rebase all the commits).
See more info and examples here.
answered Nov 14 '18 at 8:10
Shayki AbramczykShayki Abramczyk
3,8053927
add a comment |
Your Answer
StackExchange.ifUsing("editor", function ()
StackExchange.using("externalEditor", function ()
StackExchange.using("snippets", function ()
StackExchange.snippets.init();
);
);
, "code-snippets");
StackExchange.ready(function()
var channelOptions =
tags: "".split(" "),
id: "1"
;
initTagRenderer("".split(" "), "".split(" "), channelOptions);
StackExchange.using("externalEditor", function()
// Have to fire editor after snippets, if snippets enabled
if (StackExchange.settings.snippets.snippetsEnabled)
StackExchange.using("snippets", function()
createEditor();
);
else
createEditor();
);
function createEditor()
StackExchange.prepareEditor(
heartbeatType: 'answer',
autoActivateHeartbeat: false,
convertImagesToLinks: true,
noModals: true,
showLowRepImageUploadWarning: true,
reputationToPostImages: 10,
bindNavPrevention: true,
postfix: "",
imageUploader:
brandingHtml: "Powered by u003ca class="icon-imgur-white" href="https://imgur.com/"u003eu003c/au003e",
contentPolicyHtml: "User contributions licensed under u003ca href="https://creativecommons.org/licenses/by-sa/3.0/"u003ecc by-sa 3.0 with attribution requiredu003c/au003e u003ca href="https://stackoverflow.com/legal/content-policy"u003e(content policy)u003c/au003e",
allowUrls: true
,
onDemand: true,
discardSelector: ".discard-answer"
,immediatelyShowMarkdownHelp:true
);
);
Sign up or log in
StackExchange.ready(function ()
StackExchange.helpers.onClickDraftSave('#login-link');
);
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function ()
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53288610%2fhow-can-i-bring-in-changes-to-git-from-tfs-since-the-git-repository-was-created%23new-answer', 'question_page');
);
Post as a guest
Required, but never shown
1 Answer
1
active
oldest
votes
1 Answer
1
active
oldest
votes
active
oldest
votes
active
oldest
votes
After you migrate from TFVC to GIT the best practice is to lock the TFVC repo and NOT keep working on him.
But if you didn't lock and some people did a check-in with new code to TFVC, you can use the tool git-tfs (I guess you used him for the migration) to pull the changes from TFVC to your new Git repo.
The command is: git-tfs pull [options]
The pull command fetches TFS changesets (like the fetch command) and merges (or rebase using r option) the current branch with the commits fetched (creation of a merge commit or rebase all the commits).
See more info and examples here.
answered Nov 14 '18 at 8:10
Shayki AbramczykShayki Abramczyk
3,8053927
add a comment |
After you migrate from TFVC to GIT the best practice is to lock the TFVC repo and NOT keep working on him.
But if you didn't lock and some people did a check-in with new code to TFVC, you can use the tool git-tfs (I guess you used him for the migration) to pull the changes from TFVC to your new Git repo.
The command is: git-tfs pull [options]
The pull command fetches TFS changesets (like the fetch command) and merges (or rebase using r option) the current branch with the commits fetched (creation of a merge commit or rebase all the commits).
See more info and examples here.
answered Nov 14 '18 at 8:10
Shayki AbramczykShayki Abramczyk
3,8053927
add a comment |
After you migrate from TFVC to GIT the best practice is to lock the TFVC repo and NOT keep working on him.
But if you didn't lock and some people did a check-in with new code to TFVC, you can use the tool git-tfs (I guess you used him for the migration) to pull the changes from TFVC to your new Git repo.
The command is: git-tfs pull [options]
The pull command fetches TFS changesets (like the fetch command) and merges (or rebase using r option) the current branch with the commits fetched (creation of a merge commit or rebase all the commits).
See more info and examples here.
answered Nov 14 '18 at 8:10
Shayki AbramczykShayki Abramczyk
3,8053927
After you migrate from TFVC to GIT the best practice is to lock the TFVC repo and NOT keep working on him.
But if you didn't lock and some people did a check-in with new code to TFVC, you can use the tool git-tfs (I guess you used him for the migration) to pull the changes from TFVC to your new Git repo.
The command is: git-tfs pull [options]
The pull command fetches TFS changesets (like the fetch command) and merges (or rebase using r option) the current branch with the commits fetched (creation of a merge commit or rebase all the commits).
See more info and examples here.
answered Nov 14 '18 at 8:10
Shayki AbramczykShayki Abramczyk
3,8053927
answered Nov 14 '18 at 8:10
Shayki AbramczykShayki Abramczyk
3,8053927
answered Nov 14 '18 at 8:10
Shayki AbramczykShayki Abramczyk
3,8053927
answered Nov 14 '18 at 8:10
Shayki AbramczykShayki Abramczyk
3,8053927
3,8053927
add a comment |
add a comment |
Thanks for contributing an answer to Stack Overflow!
- Please be sure to answer the question. Provide details and share your research!
But avoid …
- Asking for help, clarification, or responding to other answers.
- Making statements based on opinion; back them up with references or personal experience.
To learn more, see our tips on writing great answers.
Sign up or log in
StackExchange.ready(function ()
StackExchange.helpers.onClickDraftSave('#login-link');
);
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function ()
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53288610%2fhow-can-i-bring-in-changes-to-git-from-tfs-since-the-git-repository-was-created%23new-answer', 'question_page');
);
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function ()
StackExchange.helpers.onClickDraftSave('#login-link');
);
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function ()
StackExchange.helpers.onClickDraftSave('#login-link');
);
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function ()
StackExchange.helpers.onClickDraftSave('#login-link');
);
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
docs.microsoft.com/en-us/azure/devops/repos/git/…
– CodeWizard
Nov 13 '18 at 22:09
Redo the git migration? Reapply the changes to the existing git codebase?
– DeanOC
Nov 13 '18 at 22:14
When you say you used TFS for source code - do you mean TFVC (Team Foundation Version Control) or just used TFS to host your Central Git Repo?
– DaveShaw
Nov 13 '18 at 22:22
TFVC - I didn't use TFS to host Central Git Repo.
– DaveB
Nov 13 '18 at 23:03
How did you do your migration? With 'git-tfs'? Or just copying the files?
– Philippe
Nov 13 '18 at 23:59