Manage parallel development with tools for merge tasks and source code consolidation
IBM® Merge Tool for z/OS® and OS/390® delivers an easy-to-use, Interactive System Productivity Facility (ISPF)-based, three-way merge facility. It provides both project managers and IBM System z® application developers with the tools they need to identify, analyze and consolidate independently coded changes. Merge Tool z/OS and OS/390 can help developers efficiently use and manage this process to merge up to three versions of source code.
Merge Tool for z/OS and OS/390 can help you manage the parallel development process:
- Identify components—match up base file members with other members having the same name from one or two other files. Based on the match up of the members, components that require merging are easily identified.
- Analyze complexity—build a preliminary work file to obtain member statistics including the number of conflicts found. These statistics give you a better understanding of how many conflicts there are and the resources required for the merge process.
- Merge and review changes—get a marked-up work file that shows inserts, deletions, and overlap or conflict areas.
- Address merge conflicts—edit the work file from within Merge Tool for z/OS and OS/390 and resolve conflicts before generating your final merge file.
- Create merged source—generate the merge file after conflicts have been addressed. Merge Tool for z/OS and OS/390 reads the work file as input and performs the insertions and deletions indicated in the file to generate the merge file output. The merge file contains the merged source code, which you can store in your software configuration management (SCM) tool or use as input to a compiler.
- Test merged output—compile and link the merged source code and test the changes. Merge Tool for z/OS and OS/390 provides all the tools needed to successfully complete this step including ISPF workbench, merge tool actions, reports, work file and batch utility.
Merge Tool for z/OS and OS/390 resources