DOC: Show Differences and Merging Files Not Under Source Control

ID: Q194008


The information in this article applies to:
  • Microsoft Visual Studio 6.0


SUMMARY

The Visual InterDev features for showing differences and merging conflicts can be used in a project that is not under source control. Although the documentation makes references only to Web projects that are within source control, this documentation can be used for non-source control Web projects as well.


MORE INFORMATION

To view the differences of a file in a non-source control Web project you can use on of the following methods:

Right-click the file in your Project Explorer, then click Compare to Master Web.

Another option:

Click the Project menu, go to Web Files, and click Compare to Master Web.


REFERENCES

This information can be found in the Visual InterDev product documentation by searching for these titles:

  • Working with Multiple Developers


  • Resolving Merge Conflicts


  • Updating Master Web Application


  • Synchronizing Master and Local Files


  • Show Differences (File) Command (Tools Menu)


  • Show Differences (Project) Command (Tools Menu)


  • Show Differences Command (Development Environment)


Additional query words:

Keywords : kbdocfix kbVisID600 kbGrpASP
Version : WINDOWS:6.0
Platform : WINDOWS
Issue type :


Last Reviewed: March 26, 1999
© 2000 Microsoft Corporation. All rights reserved. Terms of Use.