Resolving conflicts in compare editors - Cloud - 7.3

Talend Studio User Guide

Talend Big Data
Talend Big Data Platform
Talend Cloud
Talend Data Fabric
Talend Data Integration
Talend Data Management Platform
Talend Data Services Platform
Talend ESB
Talend MDM Platform
Talend Real-Time Big Data Platform
Talend Studio
Design and Development
Last publication date
Depending on the nature of a conflicted project item, Talend Studio provides one of the following types of compare editors for you to compare changes on the project item between both branches graphically:
  • Job Compare editor, if the conflicted project item is a Job, a Joblet, a Route, a Routelet, or a test case.

  • EMF Compare (Eclipse Modeling Framework) editor, if the conflicted item is a context group, or a database connection, an item in project settings, or an analysis if your Talend Studio supports Data Profiling.

  • Text Compare editor, if the conflicted item is a general text file, a routine, a bean, a Job script, or a SQL script.

To open a compare editor, right-click a conflicted project item in the Conflicts Navigator tree view and select Resolve in editor from the contextual menu.

After fixing conflicts in an editor, mark the conflicts as resolved and close the editor to continue your previous branch operation.