Team Foundation Server Source Control

Posted on 2010-01-06
Last Modified: 2013-11-26

I'm constantly having to merge file versions because someone checked out a file I was working on.  This seems to defeat the purpose of soure control, but in the meantime I have to work with this system.

What does it mean to "shelve" file changes?  Is there any way that the person who checked out my file can at least SEE what I've changed so they can avoid stepping on my toes?  What's the best way to deal with this problem?
Question by:NigelRocks
    LVL 9

    Accepted Solution

    Firstly, if you check out a file that don't want others to change (say that you are making a major change), you can lock this file.
    On the other hand, VSTFS provide auto merge feature to solve your problem, for me own experiences, it always did good job and I just need to use the diff tool to double confirm the result, which is much easier than merge it myself.
    About "shelve", it's a feature that let someone upload temporiary solution which wont change the code tree (so that he wont break the build). It's not helping in this case.
    P.S. The others won't be able to SEE your changes until you check in your code.
    LVL 1

    Author Comment

    By "diff tool" you mean the "merge tool"?
    LVL 9

    Assisted Solution

    I meant you can backup your change, then perform a Get, choose "Auto Merge". And then "Compare with the file on server" with the diff tool. Usually this is working while others are change different parts in the same file.

    Write Comment

    Please enter a first name

    Please enter a last name

    We will never share this with anyone.

    Featured Post

    Looking for New Ways to Advertise?

    Engage with tech pros in our community with native advertising, as a Vendor Expert, and more.

    Welcome my friends to the second instalment and follow-up to our Minify and Concatenate Your Scripts and Stylesheets (…
    More often than not, we developers are confronted with a need: a need to make some kind of magic happen via code. Whether it is for a client, for the boss, or for our own personal projects, the need must be satisfied. Most of the time, the Framework…
    Internet Business Fax to Email Made Easy - With eFax Corporate (, you'll receive a dedicated online fax number, which is used the same way as a typical analog fax number. You'll receive secure faxes in your email, fr…
    Get a first impression of how PRTG looks and learn how it works.   This video is a short introduction to PRTG, as an initial overview or as a quick start for new PRTG users.

    759 members asked questions and received personalized solutions in the past 7 days.

    Join the community of 500,000 technology professionals and ask your questions.

    Join & Ask a Question

    Need Help in Real-Time?

    Connect with top rated Experts

    10 Experts available now in Live!

    Get 1:1 Help Now