We're upgrading from Visual Studio 2010 to 2015. When I use Team Explorer to checkin files, on VS 2010, I could select a directory and it showed all the checked out files in that directory with a checkbox so I could unselect certain files I don't want to checkin. But the checkboxes seem to be gone in 2015, so I have to checkin everything in the directory. Is there a workaround to bring back the checkbox?
(Note I am not asking for a .gitignore to never check in certain files. I do want to check in the files, just not yet. Right now I want to checkin only some of them).
Right click the file in the Pending Changes view and choose "Exclude".
The feature of "Check Box" is gone in VS2015. For now, there are only Included Changes and Excluded Changes.
According to your description, you just need to click and select those files(use ctrl or shift to multiple select) and right click "Exclude"
After the operation, those files will add in Exclude list. You will not check in them. Once you want to check in them again, you just need to included them back to include list.
I've checked out a bunch of files from TFS in VS2010 and made changes to several of them. How can I see which files I actually made changes to?
Use the TFS power tools. Open a visual studio command prompt, navigate to your workspace and then type
tfpt uu /noget /recursive
This will undo any pending changes on files that haven't been modified
Is View -> Other Windows -> Pending Changes what you are looking for? That lists all of the changes in your selected workspace that are pending a check-in. It looks (and behaves) differently in VS2010, but here's what it looks like in VS2012.
To add to hawkke's answer, I use CTRL-K C to show the pending changes window - very useful.
(hit ctrl-k and the then 'C' key right after).
I use the Pending Changes window in Visual Studio 2010 to manage my files and to checkin with TFS.
My problem is that I will often be working on something and have files checked out then go onto something else, and then something else etc.... I have a lot of files checked out at once.
When I do a checkin, even if its just 1 file visual studio automatically checks the checkbox next to all other files so I have to go through and uncheck the files I dont want for my next checkin.
Is there any way to turn this feature off?
Thanks
I don't think you can turn of this feature. To better control this behaviour you have a few options:
Select the folder in which you have the files that you want to check-in and right-click for the menu and choose from there for Check-in pending changes. That will select only the files within the folder/subfolders or project that you selected from the solution explorer.
You can use a trick to deselect all files marked for check-in in the pending changes window, by selecting one file, press CTRL-A and deselect a file.
Hope that these tips will give you a smoother check-in experience. Also take a note at the comment by Lars Truijens about not mixing changes. It will be very hard to separate these checkins at not break the build at some time.
I'm using Team Foundation Server 2010 with Visual Studio 2010.
Whenever I modify a file outside of Visual Studio, TFS doesn't seem to detect the change done to the file, and thus doesn't offer me the option to check-in the file after it has been modified.
How can this be solved?
TFS has a "Reconcile" command for this:
Open the Source Control Explorer
Right-click on the folder with the changes and choose Compare
Select the files you want to reconcile (press CTRL+A to select all files)
Click on the Reconcile button
Set the options in the Reconcile Folder Differences dialog. Make sure Files that do not have pending changes is set to Check Out
Click OK
If you have local changes the Check Out dialog will be shown. Set the preferred Lock type
Click Check Out
See also: Reconcile differences between folders
If you have a network connection to your server while you're working outside of Visual Studio, it's probably best to go ahead and check the file out before editing it, either using the tf command line client, or using the Windows Explorer shell integration that's available in the TFS Power Tools release. (Plus an increasing number of other tools have TFS integration that makes this automatic, but if you're just using notepad, this still needs to be a manual step.)
Of course, there are many times when you're working and you don't have a network connection available that allows you to check out the files.
If you know what files you've modified, you can just check them out from within Visual Studio, then you'll be able to check them back in.
If you don't know what files you've edited, you can detect the changes by running the tfpt online command (also part of the Power Tools release). This will locate the files that have been modified locally and check these files out from the server.
This worked for me, using the TFS Power Tools:
tfpt online /adds /deletes /diff /noprompt /recursive directory-name
(where directory-name is the path to the directory to be updated, otherwise it will detect changes throughout your entire TFS repository)
If you want to know what it would do without it actually making any changes, you can force it to do a dry run by adding the /preview switch.
*1- make changes outside of Visual Studio
2- go to Visual Studio and open Source Control Explorer
3- right click on the folder > "Check Out for Edit" > "Check Out"
4- right click on the same folder > "Undo Pending Changes..." > "Undo changes" > "No to All"*
I tested this workaround on a branch and it helped me a lot. But there are only new files and new folder who has to be done manually.
I recommend to create a branch before the operation. It isolates you the time of the operation.
Note: This technique does also the files identical cleanup that TFS always marks as modified.
Try this. It's some sort of workaround, but it works:
make changes outside of Visual Studio
go to Visual Studio and open Source Control Explorer
right click on the folder > "Check Out for Edit" > "Check Out"
right click on the same folder > "Undo Pending Changes..." > "Undo changes" > "No to All"
That's it. The changes are visible now.
There's also another solution to get TFS to figure out the files that have changed outside of Visual Studio:
Open the solution offline
In Solution Explorer select the solution file and then press the Go Online button ()
TFS will automatically scan the solution for changes after this.
Step one can be achieved in a number of different ways. Here are some:
Use the GoOffline Extension - very simple and effective.
If you're asked for TFS credentials when opening the solution (no automatic domain auth), then don't enter the credentials. The solution will open offline and you'll login after pressing the Go Online button
(extreme solution) Disconnect your network cable; Open the solution; Connect the network cable.
Visual Sourcesafe works like this too and the way I get VSS or TFS to notice the change is by checking the file out once inside Visual Studio.
Open Source Control and go to your TFS folder. Right-click on the folder and choose 'Compare'.
Notice that your edited files show up marked in red.
I find this is better than tfpt online which also gets you files that are not readonly and not edited.
I had this problem in the past, when my Internet was down and I worked offline, and most of my changes didn't appears in Team Explorer.
Following these steps:
First, In the solution explorer, select the folder that you want to re-conciliate (for me, it was my entire solution folder), and select Compare...
Click in Modify Filter, and in the filter text-box, you could type:
*.cs;!obj\;!bin\;!packages\;
In this example, it will include in the search only C# files and exclude in the folders: bin, obj and packages.
Notice the column Pending Change has the info whether the file is marked as edit, add, etc... or nothing...
To mark as edit (when the local item has a matching server item), select the file and choose Check out for Edit...
To mark as add (when the local item doesn't have any server item), select the file and choose Add Files
Finally, I am not sure why the projects are not listed here (after I remove *.cs filter, still doesn't show up), so rebuild the solution to make sure the projects updates as well
+ In the solution, click the connect button (if shows up) that said Go Online.
I found that in Visual Studio 2015, with the project open, Visual Studio discovered for itself that files had been modified externally, and automatically checked them out without me having to do anything. Checking in the project in the normal way saved the external modifications.
In my case, the following worked (at least the one time I tried it):
Go to the Pending Changes panel
Select View Options under either Included or Excluded changes.
Switch between Show All and Show Solution Changes
Switch back if desired
Changing the View Option appears to force a refresh of modified files.
The closest thing I see to what I want is "AutoResolve All". I don't want to AutoMerge though.
In Visual Studio 2008 I could say I wanted to have the source override on all or the target on all.
Where is this option in 2010? Did they take it away? It looks like my only option is to click "Take Source Branch Version" on all 70 files one by one.
Select all and click Take Source Version.Note ctrl+A doesn't work. So select the first item, hold shift and select the last item.
Check out the TF.EXE command here.
tf.exe resolve ..... /auto:TakeTheirs will "Take Source Branch Version." My suggestion is to do the resolve, then check your branch and make sure that you have what you expect before you check in.
tf.exe resolve .... /auto:KeepTheirs will "Keep Target Branch Version"