The Compare and Merge window displays elements that need to be merged. They are displayed in a tree with a check box to select which version to merge. If you select an element with children, all its children are also selected. In the tree, you may expand the branches and look into children details and check them individually, one by one.

The tree displays the following content:

Tree

Checkable Elements

Obs.

eSpace

eSpace JavaScript

Learn more About JavaScript.

Process Flows

Processes

Conditional Start

Human Activity

Send Email

Automatic Activity

Execute Process

Wait

Decision

End

Learn more About Processes.

Screen Flows

Web Flows

Entry Points

Web Screen

Web Blocks

External Sites

Screen Preparation

Screen Actions

Web Screen JavaScript

Web Block JavaScript

Web Screen Style Sheet

Web Block Style Sheet

Learn more about how to Design Web Flows.

 

SMS Flows

Application Phones

Wait for Message

Send Message

Start iSMS

Learn more about how to Design SMS Flows.

Actions

User-defined Actions

Learn more About User-defined Actions.

Web Services

Exposed SOAP Web Service

Consumed SOAP Web Service

SOAP Method

Exposed REST API

Consumed REST API

REST API Method

Learn more about Web Services.

Entities

Entities

Attributes

Learn more About Entities.

Structures

 

Structures

Attributes

Learn more About Structures.

Session Variables

Session Variables

Learn more About Session Variables.

Site Properties

Site Properties

Learn more About Site Properties.

Timers

Timer

Learn how to Use Timers.

Roles

Role

Learn more About Roles.

Images

Image

Localized Images

Learn more About Images.

Themes

Themes

Learn more About Themes.

Resources

Resources

Learn more About Resources.

Exceptions

Exception

Learn more About Exceptions.

References

(<Producer name>)

 

Elements are presented in the same order as in the Add/Remove References Window.

Process Flows

Processes

Screen Flows

 

Web Screens

Web Blocks

Actions

User Actions

Themes

Themes

Entities

Entities

You cannot individually check attribute references as in the Entities or Structures folders. You must merge the whole reference.

Structures

Structures

See Also

About Working in Teams | Resolve Conflicts | Compare and Merge