Sublime Forum

Ability to resolve a file with conflict markers?


In my workplace, there are sometimes instances when a release engineer is merging some branches and they hit conflicts that they don’t have enough context to resolve.

In such a case, the engineer will commit the conflicting files with the Git conflict markers <<<<<< HEAD, and then ask the responsible engineer to fix it by pushing followup commits.

Is it possible to use Sublime Merge to resolve such conflicts? By default it doesn’t seem to recognize these files as conflicting files, but I wonder if there is a way to launch smerge mergetool to achieve this? There is no well defined “left” and “right” file in this case as the conflicts are marked in a single file.



Not that I’m aware of, no; I believe that the conflict resolution is triggered by knowing that the file is conflicted and not by the conflict markers that appear in the file content.

1 Like