Merging Visual Basic .MAK Files in Delta

ID: Q131848

The information in this article applies to:

• Microsoft Delta for Windows, version 1.0

SUMMARY

A merge conflict in the .MAK file for a Visual Basic project may evolve during parallel development. If the Visual Basic project .MAK file is checked out to more than one developer and each developer adds or removes a different project file (.FRM, .BAS, and so on), the last developer to check in the .MAK file overwrites the changes submitted earlier.

The merge conflict can also occur if other settings recorded in the .MAK file are changed, such as various project related properties.

MORE INFORMATION

Most merge conflicts involving the .MAK file occur early in development, when new .FRM and .BAS files are created and added to the project. It is best to plan out the forms and modules needed in a project, and have one developer create those forms and modules, using the proper file names.

As additional forms or modules are needed (or as filenames or other project properties are changed), a single person should make these changes in the .MAK file. At any one time, the project's .MAK file should be checked out exclusively to a single developer.

NOTE: Merging files by hand can be aided by using the "View Local Changes" command in the View menu to highlight differences between the two files.