tfvc

I am using Visual Studio 2017 with Team Foundation Version Control (TFVC). I am trying to merge changes from a parent branch into a child, but I am getting tons of conflicts that shouldn't exist. The compare function works fine and shows a hand full of difference, but the merge tool is trying to shuffle the 2 sets of code together like a deck of cards. It's so bad, I would feel safer making the change manually. Is there a way to help the Merge Tool identify the comparable lines of code? You can try the external Compare amd Merge Tools, e.g WinMerge , ExamDiffPro or Beyond Compare . For example

In git there is a very handy feature that lets you fix your last commit, e.g. when you have forgotten something that does not justify a full commit. It is very easy to do this in git: git commit --amend That way you don't have to specify a commit message or anything else, the commit is simply "appended" to your last full commit - or at least that is how I understand it. Is there anything similar available in TFVC? No, not really. You can update the Check-in comment, or associate a work item, but you cannot change the file contents of the check-in. A rollback doesn't help either, since that

I want to use TFS in Android Studio. I installed Visual Studio Team Services and then in TFVC of Settings, i should to select TF executable file, i downloaded TFE of below link but when i Test TF exe file, i give below error. The specified path does not lead to a valid TF executable. Downloaded link: https://github.com/microsoft/team-explorer-everywhere/releases How can solve this problem? Please double check if you have follow below steps: You must have the TF command line tool installed to be able to use TFVC features. The minimum version supported by the plugin is 14.0.3. To install the

I have several projects hosted as separate TFS projects. When I want to check-in changes, all the changes of all projects sum up together and commit as one check-in. I want to handle the check-ins per project, so that the current check-in only commits the files of the current solution. Here is what the TFS Pending Changes page looks like: The red is "Project 1", the black is "Project 2", I don't want the black to be here at all. There are several options: You can create separate workspaces for each project and only map the directories that belong to said project, that way the changes will not

I have an existing Android project developed in Android Studio using Kotlin. It's not yet under version control. I'd like to add it to Visual Studio Team Services in a new classic TFVC project, not a Git project. Can anyone explain how to do this, or point me to a tutorial? I have installed the Team Services plugin and configured the TF executable, but now I'm going around in circles trying to associate my project with a new or existing TFVC project. I see an option to import into a Git TFS project, but nothing for TFVC. Nothing seems to quite do what I need. Any pointers? After install the

How to connect TFVC (version control) to Visual Studio Code? Interested in basic operations such as checkin, checkout, resolve. Microsoft recently released Visual Studio Team Services Extension for Visual Studio Code . The process of installing is pretty straight forward: Search for Visual Studio Team Services in VS Code and select to install the one by Microsoft Open File -> Preferences -> Settings Add the following lines to your user settings If you have VS 2015 installed on your machine, your path to Team Foundation tool (tf.exe) may look like this: { "tfvc.location": "C:\\Program Files

I introduced Git to my dev team, and everyone hates it except me. They want to replace it with Team Foundation Server. I feel like this is a huge step backwards, although I am not very familiar with TFS. Can someone with experience compare branching support on TFS to Git branching? Also, in general, what are the pros and cons of TFS? Am I going to hate it after using Git for a few years? eckes I think, the statement everyone hates it except me makes any further discussion waste: when you keep using Git, they will blame you if anything goes wrong. Apart from this, for me Git has two advantages

I mucked around with TFS settings and I accidentally included the bin and obj folders for TFS 2012 checkin, and even checked them in already. I don't want this because these files change often and aren't meant for inclusion. I've checked What happened to "Exclude from Source Control" in VS2012 . The accepted answer doesn't work because the bin & obj folders and the DLLs inside those folders don't appear in the "Promote Candidate Changes" list, even after excluding them. The second most popular answer also doesn't work permanently. I press yes to all and it removes them from the included