Skip to main content

Resolving conflicts in compare editors

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.

In this section

Did this page help you?

If you find any issues with this page or its content – a typo, a missing step, or a technical error – please let us know!

Leave your feedback here