locked
Baseless merge and version conflicts RRS feed

  • Question

  • I am trying to do a baseless merge between two branches. The conflicts are all of Type Version except for the few files that actually were different. When I tried to do a Autoresolve, it could not resolve the Version conflicts, of which there were 9700+ of them. Is there way to tell TFS to ignore the version conflicts? There's no way that we can manually resolve 9700+ conflicts...

     

    Thanks,

    Jim

    Thursday, June 8, 2006 3:31 PM

Answers

  • "AcceptYours" is the resolution that means "don't touch anything in the target branch," or equivalently, "discard the changes coming from source."

    You can select everything in the Resolve UI & choose the bottom radio button, or use the command line tf resolve /auto:acceptyours
    Thursday, June 8, 2006 5:59 PM
    Moderator