Job Compare editor, if the conflicted project item is a standard Job, a Joblet, a Route, a Routelet, 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.
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 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.