Resolving conflicts in conflict editors - 7.1

Talend Data Management Platform Studio User Guide

author
Talend Documentation Team
EnrichVersion
7.1
EnrichProdName
Talend Data Management Platform
task
Design and Development
EnrichPlatform
Talend Studio
Depending on the nature of a conflicted project item, Talend Studio provides one of the following types of conflict editors for you to compare changes on the project item between both branches graphically:
  • Job Compare editor, if the conflicted project item is a standard Job, a Joblet, or a test case.

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

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

To open a conflict 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.