Skip Headers

# Merging Files

Previous

Next

The most difficult aspect of application development is merging changes from two (or more) development team members that have simultaneously edited the same file. If one developer checks in his or her changes, a merge condition exists. Use a file comparison tool to determine the merged aspects of the project. The files to edit will vary, depending on the type of merge:

- Merging Project Files

- Merging Table, Descriptor, and Class Files

Example: Merging Projects and Example: Merging Files demonstrate a merge out merging technique.