I want to compare 2 files that reside on my local disk while offline from TFS. I appears that while offline, there is no functionality to do that compare. Is there a good tool to file comparisons and hopefully a merge?
I suggest you to use WinMerge tool
link : http://winmerge.org/?lang=fr
This tool can be integrated or not in your Visual Studio, on Source Control
My favourite tool for doing this is DiffMerge.
Related
I have a Visual Studio project that I want to work on in two computers.
I'm looking for how to sync the project between the computers.
I have a few options, and I'm open to other suggestions:
Dropbox
OneDrive, which is integrated nicely in Windows 10.
Github, although I'm not sure if it is used for this purpose, and don't want my code to be public.
What has worked for you?
Thanks!
If you use Visual Studio, then Visual Studio Team Services is good for you.
For source control you can use TFVC or Git and it's free (for team up to 5 people) and repositories are private.
GitHub is a nice choice, not only to share between machines, but mainly as version control.
Also, if your version of Visual Studio supports it, you could use TFS - the versioning integrated to it.
OneDrive or Dropbox doesn't have version control - once your project grows, you will notice it is really needed.
For source control I would prefer tortoise svn (over git and bitbucket) - because it's easier to use.
For data replication / sync - google drive. Its similar to microsoft one drive, but bit faster.
Oh common - downvoters ! :-) I know you're absolutely love git, but unfortunately it's too over abstract, lacks of proper error handling, to difficult to use.
We can skype if you think otherwise, and I can prove it to you.
I want to undo the old project files that I got from my colleague to understand what was created first. Is it possible? Is there any tool for achieving this?
Unfortunately it's not possible. That would only be possible if you colleague had been using a version control system (like Subversion, Mercurial, Git, TFS etc).
I am the only developer for an application. All the files for this application are stored on the same computer and I am using Visual Studio 2010 Ultimate.
The application has three solutions and these share common items such as some stylesheets, some javascript and shared views.
It's starting to become difficult when I change one file as I have to copy this to the other projects in the other solutions.
Is there a simple way that I could share files. Something that would help me be more productive. Possibly even some single user source code or a way of linking files between solutions.
Hope I can find someone to help me make my life easier.
Robert W
Even if you work on your own I would suggest some kind of Source Control System. Team Server is now free with Visual Studio or you can use open source tools. Like this you can link to source files in other projects and you can reuse your files.
Use Source Control! SVN is free so is TFS with Ultimate.
If its web based files (javscript, pictures, css, etc) use a virtual directory to point to the common code directories.
if its compiled code (C#,VB, etc) you can link the files. When adding an existing file in the dialog it will have a open button, with an arrow down. click the arrow down and "add as link" will be available. It will then use relative referencing to the other file. I use this technique for a SolutionAssemblyInfo.cs file.
I would recommend placing the common files in the same directory as the solution file or no more than 1 folder deep.
Our dev team is small (3 developers) and windows based.
I'm looking for a source control that can do the following:
Check out files for editing and warn others that file is used
Check in files and merge if they have changed
Split baselines for release versions and merge baselines if needed
Visual Studio integration
Can work over WAN
Thanks.
SW
Team Foundation Server fits all of those.
SVN would be great, as long as you use locking (normally the server has no idea what clients are doing by default)
Perforce might be a nice one to look at which does this more by default.
Both have VS integration, SVN especially.
SVN, provided that you explicitly lock the files. This is not by default, but you can easily lock the file via SVN commands or via TortoiseSVN.
VisualSVN provides the Visual Studio integration.
If you want good Visual Studio Integration, then check out Microsoft Team System. You didn't specify if you wanted free or commercial or how critical Visual Studio intergration was.
git will do almost all of it. Not sure about integrating it with Visual Studio though. there might be a plugin for that.
Reasons:
No central server needed. If you want one, you can have one, but it's not necessary
You can push/pull changes to the others at will.
Each of you can have your own local branches, and push only the ones you need to
each other. Branching/merging is easy enough to do branch-per-task. Then push just that task to a co-worker if needed.
Unlike SVN, only one directory is needed for git, in the top level of the directory structure.
git stash rocks for when you have changes in your current branch, and need to switch to another for a while. This is one of those things you don't miss until you don't have.
Merges are awesome.
I'm looking to move to distributed source control since I use multiple computers and often work offline. What if any distributed source control systems integrate with visual studio and how good is the integration?
Have you considered using Git? You can host open source projects on github for free.
For integration please refer to Using Git with Visual Studio which indicates it is possible.
I'm not sure about integration with VS but I have used the excellent Tortoise Windows Explorer plugins. We use Tortoise-CVS and SVN all the time and they are fast and reliable.
They do a Tortoise-Hg plugin for Mercurial as well.
It may sound funny, but I rarely use my VS integration even though I have one.
Tortoises and command line work great, and Bzr and Hg have workable tortoises.
AnkhSVN does the job nicely for me and my team.
Jared,
If you need distributed and VStudio integration, then you're talking about Plastic SCM
The whole GUI is integrated with VStudio 2005 and higher, and SCC integration is available starting with VStudio 6.
It directly supports renaming and moving files from VStudio too.
Plastic SCM is free for students, for open source projects and most likely you can get some free licenses for personal projects too.
There is VisualHG too, with TortoiseHG it is a Visual Studio Plaugin.
I use subversion and tortoisesvn. For integration with VS, I use VisualSVN which does cost money but it pretty cheap and works flawlessly. There are free subversion source control provider packages for Visual Studio and I tried a few but VisualSVN worked so much better so I went with it.
I like using KilnHG (which is an online wrapper around Mercurial) - it's free for small numbers of developers from what I can recall.