How to rebase in TFS using TFVC? (like git rebase functionality)

Question

Using tfs2015 (not git but tfvc)

We have a MAIN branch and I created my development branch from MAIN branch.

__MAIN (branch)
  |__MYDEV (my new branch)

After a while, my friends pushed 2 new changesets to MAIN.

__MAIN [change1], [change2]
  |__MYDEV [mychange1]

Question: How can I get those 2 changesets onto MYDEV branch as 2 changesets as they are by merging (rebasing) my change on their changes?

If I try merging MAIN onto MYDEV, 2 changesets are coming as pending changes of bunch of files, but I want them as they are as packaged in 2 changesets and put my changes on them.

Finally what I expect,

__MAIN [change1], [change2]
  |__MYDEV [change1], [change2], [mychange1-with-merge-fixes]

score 1 · Answer 1 · edited May 23 '17 at 12:16

1

If you use git-tfs it will give you all the powers of git, highly recommended. Now, visual studio will maybe be a little bit upset when it detects a .git directory, but you can avoid that by setting GIT_DIR and GIT_WORK_TREE environmental variables (see this answer for details).

edited May 23 '17 at 12:16

Community

1
1

answered Oct 27 '15 at 19:59

hlovdal

26,565
10
94
165

score -3 · Answer 2 · answered Oct 27 '15 at 07:43

-3

You can use "Rebase" tool to keep every merged changeset separately in the branch.

To use rebase tool in TFS, follow the steps below if you have Team Explorer installed:

Launch Team Explorer and connect to your project.
Open "Branches".
Checkout the branch (MYDEV) you'd like to rebase.
Right click the branch and select "Rebase Onto..." option.
Select the Onto Branch (MAIN) and then click "Rebase" button. (Resolve the conflict and click "Continue" button if there is any conflict during the rebasing)

Introduction about TFS Rebase: https://msdn.microsoft.com/en-us/Library/vs/alm/Code/git/rebase

answered Oct 27 '15 at 07:43

Eddie Chen - MSFT

29,708
2
46
60

thanks for your help, but I can not see the "Branches" in team explorer, do you have any idea? – mehmet mecek Oct 27 '15 at 08:33
I tried on source control explorer, by right clicking on my branch but there is no "Rebase onto .." option. – mehmet mecek Oct 27 '15 at 08:34
1

well, you're talking about git, we are using tfs unfortunately for source control – mehmet mecek Oct 27 '15 at 08:36
TFS2015 support two version control: TFVC and Git, do you mean you are using the TFVC version control? – Eddie Chen - MSFT Oct 27 '15 at 08:55
yes, I m not talking about git, it is totally VisualStudio, Team foundation server and its fracking source control tool (TFVC). – mehmet mecek Oct 27 '15 at 09:20
7

TFVC does not support the "rebase" feature. – Eddie Chen - MSFT Oct 28 '15 at 01:03

How to rebase in TFS using TFVC? (like git rebase functionality)

2 Answers2