Adobe Flash Catalyst CS5 : Merging Changes from Catalyst into Flash Builder

In Catalyst, choose File => Open Project.

Select the back-up copy of the project.

Click Open (see Figure 1).

Figure 1. Selecting the back-up copy of the project to be opened in Catalyst

Make any needed changes to the project. In this example, the heading text in the HomeState component is being changed (see Figure 2).

Figure 2. Editing the project in Catalyst

Choose File => Save to save the project in Catalyst (see Figure 3).

Choose File => Save As to create a new back-up copy of the project. Once the changes are merged into Flash Builder, you will be unable to open the current back-up to the project in Catalyst for further edits, so you should make a new back-up. Of course, you could pass the new back-up off to Flash Builder, and continue using the current one as your Catalyst file.

Type a new name or navigate to a new location to save the back-up (see Figure 4).

Figure 3. Saving the project

Figure 4. Saving a new back-up of the project

Switch to Flash Builder.

Choose File => Import Flex Project (FXP).

Click Import new copy of project (see Figure 5).

Navigate to the location of the new file from Catalyst. The changes will be opened in Flash Builder as a new project.

Figure 5. Importing a new copy of the project

To merge those changes into the existing project, right-click (+click) the new project in the Package Explorer.

Select Compare With (see Figure 6), than select the original project. If it is the only other project currently open in Flash Builder, it will be the only item on the list.

Flash Builder examines the code in both projects and display a dialog box detailing the differences it discovers between the two. Depending on the size and complexity of the files and your computer's resources, this process might take some time to complete.

Figure 6. Selecting the Compare with command

Expand the src folder, then the components folder, and then double-click HomeState.mxml. The component opens and the first difference between the files is highlighted.

Click Next Difference to move to the next change. If necessary, scroll to the right to see the highlighted differences (see Figure 7).

Click Copy All from Left to Right (see Figure 8).

Figure 7. Changes highlighted in the code

Figure 8. Accepting the changed code

Click Close on the Compare window's tab (see Figure 9).

Figure 9. Closing the Compare window

Click Yes to save the comparison (see Figure 10).

Right-click (+click) the project in the Package Explorer and select Close project (see Figure 10).