Resolving TFS conflicts the hard way

The problem After some merge/check-in operation, I could not resolve conflicts with Visual Studio Conflicts Channel (MSDN has a guide on resolving conflicts between two files). I tried Take Server Version and Keep Local Version, but the conflicts were reappearing. The solution I finally managed to resolve the conflicts by using the command line tool TF. This contains the Resolve Command. By using the parameter /auto:DeleteConflict I could remove the conflict. Weiterlesen →