recently I removed all branches from a TFS 2010 directory, making it standalone again, however it still has an icon showing that seems to indicate it's a parent to a branch. Is there anyway to remove that icon and make it look like the rest of the folders? This is with TFS 2010. Thanks!
Select this folder in team explorer. Select File menu > source control > Branching and merging > convert to folder.
Regards
Related
I am working with Source Control Explorer inside Visual Studio, and I am very confused with the way it works:
I have a project, where the structure is:
Folder
Branch
Folder
As in:
I just tried creating one myself (I never created one myself) and I can't ge the same structure... How can I create a branch so I match the above structure??
The only documentation I found is only related to Git in Visual Studio and not to this Azure DevOps-like.
From your screenshot, you are using the TFVC Repo and there is a plus sign in front of your folders. This means that the changes hasn't been checkin to the TFVC repo server side.
To match the above structure, you need to checkin the change first.
Then you can right click on the folder and select Branching and Merging -> Branch.
I am working on a solution that has 14 projects (so far) in it. I added the solution to Azure Devops source control and can see that the solution and the startup project have the little locks in the solution explorer, also I can see the startup project files in the devops repo, but I can't see how to add the other projects. Obviously I messed up somewhere, since ideally the repo would contain a folder for the startup project rather than the files themselves, but I don't know how to "undo" the source control and reset my solution back to its original state.
Can someone tell me how to either fix the source control so that the master branch contains all of the projects in sub-folders (as per the visual studio folder structure) - i.e. how to move the startup project files in the devops repo to a sub-folder and how to add the other projects to their own sub-folders, or, failing that, how to undo the source control so that all of my solution files are back on my local hard disk?
Any advice will be appreciated.
You mentioned that you are using git. So when you DO NOT have local changes which are not pushed to your git server, that means everything is "synced".
Make a backup of your folder, just copy & paste everything!
You can just delete the .git folder. So you have no "link" to the git server anymore.
You can the link the "folder" again to your git server, with sth. like:
git remote add origin https://YOURNAME.visualstudio.com/YOURPROJECT.git
Other option is check your .gitignore file, maybe some of your projects are excluded.
When you are working with Visual Studio, can can also create a new empty solution and add the projects one by one. Also be sure that there is NO Filter in Project Explorer in Visual Studio.
You can also check your git changes, with git log or git status from any terminal or command line tool.
I wonder if someone could give me a pointer on this one. I've started to use Team server with my copy of Visual Studio 2015 community. I'm trying to get all my main solutions synched up, but somehow one of them (Investments4) is showing in team server, but not in my local VS's source control explorer. Here are the two screens. Any pointers would be gratefully received.
The investments 4 project is the Git team project, which should not listed in the Source Control explorer. Also you can’t open Source Control Explorer if you connected to Git team project.
You can check files in repositories of Git team project on web access. (open team project in internet explorer > Code > Files)
I was adding a new Solution to TFS in Visual Studio 2013, and I selected Git as opposed to TFS.
I want to remove the Git binding, and add TFS.
I know you can remove TFS binding from File -> Source Control, but this doesn't seem to be an option here.
How can I remove Git binding from a Visual Studio solution, and add TFS?
Thanks
I don't believe Visual Studio adds anything special for git integration. It just looks for the presence of the .git directory in the solution folder. Delete that folder, possibly hidden, and Visual Studio will no longer consider it a git project.
As #JaredPar mentioned, if you delete the highlighted directories and reload the solution then the solution would no longer be under source control.
Go to Quick Launch(Ctrl+Q)
Search for "Source"
Select the following option
Select the Dropdown list
Choose your source control from list and click "ok"
Just as a side note. If you by accident create a Git repository in a parent folder of a project under TFS, Visual Studio will use Git as source control for that project too.
Both Team Foundation Server (TFS) 2005 and 2008 lose history (check-ins + comments) on files when they branched and merged back. So e.g. if changes in a branch are made then merged back to the root branch, none of the changes made in the branch are visible in the root branch. The only thing visible in the history states that a merge occurred.
Does anyone know if there is an option which can be set to retain the history, or a different way to do the merge which keeps the history?
You are correct that TFS does not track history by default when merging. There is a powertool, however, that allows you to do so (see History Command under TFS Power Tool Commands).
See this comment for more details:
“If TFS would only maintain the history of branched files, rather than starting them from scratch every time a branch is done, then a similar safe merge would be possible between branches”
You can install the Power Tools and then use the /followbranches flag to retrieve the history information: http://msdn2.microsoft.com/en-us/vstudio/aa718351.aspx
History Command
Use the history command to display the revision history for one or more files and folders. The /followbranches option returns the history of the file branch's ancestors.
There is also a codeplex project to enable the option in the GUI:
http://www.codeplex.com/TFSBranchHistory
TFS Branched History plugin for VS2010 is now available from Microsoft Gallery:
http://visualstudiogallery.msdn.microsoft.com/7d4f37b6-f9a4-44c6-b0a0-994956538a44
This plugin is just query history from different branches and make union of the records.
The TFS Branched History plugin from Microsoft Gallery only works with VS2010.
For those using Visual Studio 2008, here is a plugin that provides the same functionality.
After you install it, open up VS2008 and go to the TFS Source Control window.
Right-click on an item and you will see a new option in the context menu called "Branched History".
Click on this to get the history of the item in all previous TFS branches. Give it a few seconds if you're on a slow machine.
In the "Branched History" window you can also View or Compare file versions just as you can in the regular "History" window.