baseless merge not showing in Source Control Explorer

Question

I have performed a baseless merge using something like:

>tf merge /baseless /recursive SourceBranch TargetBranch.

After this I can without problems perform regular merges using:

>tf merge /recursive SourceBranch TargetBranch.

However if I open Source Control Explorer for the SourceBranch and select Branching and Merging -> Merge..., there is no option to perform a similar merge. The list of targets doesn't include the TargetBranch. Is there some way to achieve this so I don't have to go to the command line after having performed a baseless merge?

Thanks,
Morten

Answer 1

NB. I'm using Team Foundation Version Control Tool v. 10 against a 2008 server.

Answer 2

Hello NovaML,

Based on your above description, I got to know that your main issue is that you would like to do the baseless merge in VS IDE. However, I am sorry to say that currently this is not supported. You can only perform a baseless merge by using the Tf merge command. You cannot perform a baseless merge from within the Visual Studio IDE. For more information, please see: http://msdn.microsoft.com/en-us/library/bb668976.aspx

If you think it is a very important feature for you, you can consider submitting one feature request on the Microsoft UserVoice site here: http://visualstudio.uservoice.com/forums/121579-visual-studio 

Thanks.

---

Vicky Song [MSFT]
MSDN Community Support | Feedback to us

Answer 3

I'm fine with performing the baseless merge from the command line. It would however be very nice, if I subsequently was able to merge along the same merge path from Visual Studio, but my problem is, that Visual Studio doesn't seem to be aware of that merge path. So the question is, if this can somehow be forced through.

Answer 4

Hi NovaML,

I just did a test on my machine, and I noticed that after you excute the tf merge /baseless /recursive Branch1 Branch2 command, in the VS Source Control Explorer, right click the Branch2 and select Branching and Merging->Merge->you can get the Branch1 in the Target Brach dropdown list on the Merge Wizard. And you can choose to merge it. After you merge from Branch2 to Branch1, then you can get Branch2 shown in the Target Branch dropdown list on the Merge Wizard when you are trying to merge from Branch1 to Branch2. Does this help you?

Thanks.

---

Vicky Song [MSFT]
MSDN Community Support | Feedback to us

Answer 5

Hi Nova,

My recollection is that it can be difficult/impossible to get a new merge target to show up in the Merge Wizard when using a TFS 2008 server. I know for a fact that this scenario works when using a 2010 client and server together -- and you mention you're already using the VS 2010 client. If/when you upgrade your server to 2010, my expectation is that this will just start working for you.

I hope you'll consider upgrading. The 2010 server is a tremendous improvement over 2008.
Thanks,
P. Kelley

Answer 6

Yes your right. For some reason I cannot reproduce this for folders though - only for files. Since it's only a few files, this will work for now. Thank you